seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,498 Commits
124 Branches
308 Tags
147 MiB
Commit Graph

121 Commits (d207193377be82fb09aaff95fe16cd95414f1d2b)

Author SHA1 Message Date
Sergii Leshchenko d207193377 CHE-6463 Exclude docker infrastructure from multiuser packaging 2017-09-28 13:06:50 +03:00
Sergii Leshchenko 108b3d832b Merge remote-tracking branch 'origin/che-multiuser' into spi-multiuser 
# Conflicts:
#	assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java
#	dockerfiles/init/manifests/che.env
#	plugins/plugin-docker/che-plugin-docker-machine/src/test/java/org/eclipse/che/plugin/docker/machine/MachineProviderImplTest.java
#	plugins/plugin-docker/pom.xml
#	plugins/plugin-github/che-plugin-github-pullrequest/src/main/java/org/eclipse/che/plugin/pullrequest/client/GitHubHostingService.java
#	pom.xml
#	wsagent/agent/src/main/java/org/eclipse/che/api/agent/WsAgentLauncher.java
#	wsagent/agent/src/test/java/org/eclipse/che/api/agent/WsAgentLauncherTest.java
#	wsmaster/che-core-api-machine/pom.xml
#	wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/EnvironmentImpl.java
 2017-09-28 12:33:07 +03:00
Artem Zatsarynnyi 685def4d29 Merge branch 'master' into spi 2017-09-21 09:24:39 +03:00
Sergii Kabashniuk 546ba4e4ea Merge with master 2017-09-20 11:34:18 +03:00
Roman Iuvshyn 8e03d56bfb RELEASE: Set next development version (#6345) 2017-09-19 14:52:53 +03:00
Artem Zatsarynnyi 04be689c69 Merge branch 'master' into spi 2017-09-04 11:51:57 +03:00
Max Shaposhnik 7d3cf94a30 Merge with master 2017-08-23 14:08:07 +03:00
Roman Iuvshyn 2850a74a11 RELEASE: Set next development version (#6067) 2017-08-23 11:11:34 +03:00
Artem Zatsarynnyi a552e67a76 Merge branch 'master' into spi 2017-08-17 16:40:48 +03:00
Artem Zatsarynnyi 51fed52707 Merge branch 'master' into spi 2017-08-17 15:21:26 +03:00
Max Shaposhnik c8b92fcc74 Merge with master 2017-08-11 16:42:29 +03:00
Mykhailo Kuznietsov 69d5148385 Changed copyright owner to "Red Hat, Inc." in license headers (#5964) 
Change license header contributor to Red Hat, Inc.
 2017-08-11 10:46:58 +03:00
Max Shaposhnik 5acb5cf9e4 Merge with master and create multiuser readme 2017-08-09 14:53:11 +03:00
Roman Iuvshyn c2eb3188c1 RELEASE: Set next development version (#5949) 2017-08-09 11:17:20 +03:00
Max Shaposhnik aee3a1ba18 Machine provider fix 2017-07-28 17:32:54 +03:00
Artem Zatsarynnyi b851196df5 Merge branch 'master' into spi 2017-07-20 12:30:15 +03:00
Roman Iuvshyn 185273f8b9 RELEASE: Set next development version (#5734) 
* RELEASE: Set next development version
 2017-07-19 12:45:32 +03:00
Artem Zatsarynnyi 1ba5f63d8f Merge branch 'master' into spi 2017-06-29 17:45:59 +03:00
Roman Iuvshin eab04ddd6b RELEASE: Set next development version 2017-06-29 07:59:05 +00:00
Artem Zatsarynnyi ad2460999e Merge branch 'master' into spi 2017-06-22 08:27:59 +03:00
Roman Iuvshin 513aa19ebd RELEASE: Set next development version 2017-06-21 13:04:16 +00:00
Artem Zatsarynnyi cce79bf469 Merge branch 'master' into spi 
# Conflicts:
#	assembly/assembly-wsmaster-war/pom.xml
#	infrastructures/docker/pom.xml
#	plugins/plugin-docker/che-plugin-docker-compose/pom.xml
#	plugins/plugin-github/che-plugin-github-pullrequest/src/main/java/org/eclipse/che/plugin/pullrequest/client/GitHubHostingService.java
#	plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunAllTestAction.java
#	plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunClassTestAction.java
#	plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunAllTestAction.java
#	plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunClassTestAction.java
#	plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunTestXMLAction.java
#	pom.xml
#	wsmaster/che-core-api-machine/pom.xml
 2017-06-15 10:35:47 +03:00
Roman Iuvshin eb2fa0eeed RELEASE: Set next development version 2017-06-14 07:13:04 +00:00
Artem Zatsarynnyi 993e8df52e Merge branch 'master' into spi 2017-05-24 12:16:17 +03:00
Roman Iuvshin 9fbf173eb9 RELEASE: Set next development version 2017-05-24 07:30:41 +00:00
Alexander Garagatyi 21c4589086 Merge branch 'master' into spi 
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
 2017-05-15 12:27:23 +03:00
Roman Iuvshin b3ae33acf5 RELEASE: Set next development version 2017-05-10 10:54:42 +00:00
Alexander Garagatyi 7877e47f6a Merge branch 'master' into spi 
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
 2017-04-27 12:08:59 +03:00
Roman Iuvshin 6d88cf8c73 [maven-release-plugin] prepare for next development iteration 2017-04-25 18:19:17 +00:00
Roman Iuvshin d7f023fd89 [maven-release-plugin] prepare release 5.9.0 2017-04-25 18:19:10 +00:00
Alexander Garagatyi 7e0ed03cf2 Merge branch 'master' into spi 2017-04-19 16:52:48 +03:00
Roman Iuvshin 7805c146e6 [maven-release-plugin] prepare for next development iteration 2017-04-13 11:07:13 +00:00
Roman Iuvshin e8107fd96c [maven-release-plugin] prepare release 5.8.0 2017-04-13 11:07:06 +00:00
Yevhenii Voevodin 791b898447 Merged with master 2017-04-12 16:18:56 +03:00
Roman Iuvshin 840ae853f8 Revert "RELEASE: set minor change version" 
This reverts commit e23b9257a3.
 2017-04-11 20:55:24 +03:00
Roman Iuvshin e23b9257a3 RELEASE: set minor change version 2017-04-11 18:10:45 +03:00
Alexander Garagatyi 44e4d2f2b9 move docker machine plugin code into docker infrastructure module 
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
 2017-04-07 11:30:21 +03:00
Alexander Garagatyi 9c3c5336c3 add fixes of build (inomplete) 
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
 2017-04-06 17:52:14 +03:00
Roman Iuvshin 08d4d0f25c [maven-release-plugin] prepare for next development iteration 2017-04-06 14:28:39 +00:00
Roman Iuvshin 53a0325213 [maven-release-plugin] prepare release 5.7.0 2017-04-06 14:28:33 +00:00
Roman Iuvshin 342f103654 [maven-release-plugin] prepare for next development iteration 2017-03-30 12:25:35 +00:00
Roman Iuvshin e6e4a652cc [maven-release-plugin] prepare release 5.6.0 2017-03-30 12:25:28 +00:00
Roman Iuvshin e7588aa2b3 [maven-release-plugin] prepare for next development iteration 2017-03-15 14:59:35 +00:00
Roman Iuvshin 69cf9f5528 [maven-release-plugin] prepare release 5.5.0 2017-03-15 14:59:28 +00:00
Roman Iuvshin ceff3938ff [maven-release-plugin] prepare for next development iteration 2017-03-02 18:33:12 +00:00
Roman Iuvshin 8ed6e10476 [maven-release-plugin] prepare release 5.4.0 2017-03-02 18:33:06 +00:00
Roman Iuvshin e71c7b5671 [maven-release-plugin] prepare for next development iteration 2017-02-17 11:04:07 +00:00
Roman Iuvshin c071c65aa2 [maven-release-plugin] prepare release 5.3.0 2017-02-17 11:03:59 +00:00
Roman Iuvshin 0dd0dea686 [maven-release-plugin] prepare for next development iteration 2017-02-01 13:31:32 +00:00
Roman Iuvshin d138c3623f [maven-release-plugin] prepare release 5.2.0 2017-02-01 13:31:25 +00:00