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
che-server/wsagent
History
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
..
agent Merge remote-tracking branch 'origin/che-multiuser' into spi-multiuser 2017-09-28 12:33:07 +03:00
che-core-api-debug RELEASE: Set next development version (#6345) 2017-09-19 14:52:53 +03:00
che-core-api-debug-shared RELEASE: Set next development version (#6345) 2017-09-19 14:52:53 +03:00
che-core-api-git Revert Git revert action (#6470) 2017-09-27 15:21:46 +00:00
che-core-api-git-shared Revert Git revert action (#6470) 2017-09-27 15:21:46 +00:00
che-core-api-languageserver RELEASE: Set next development version (#6345) 2017-09-19 14:52:53 +03:00
che-core-api-languageserver-maven-plugin RELEASE: Set next development version (#6345) 2017-09-19 14:52:53 +03:00
che-core-api-languageserver-shared RELEASE: Set next development version (#6345) 2017-09-19 14:52:53 +03:00
che-core-api-oauth RELEASE: Set next development version (#6345) 2017-09-19 14:52:53 +03:00
che-core-api-project Merge branch 'master' into spi 2017-09-26 10:24:43 +03:00
che-core-api-project-shared Merge branch 'master' into spi 2017-09-21 09:24:39 +03:00
che-core-api-testing CHE-5729: adapt PHP test runner according new API (#6201) 2017-09-21 10:32:10 +03:00
che-core-api-testing-shared CHE-5729: adapt PHP test runner according new API (#6201) 2017-09-21 10:32:10 +03:00
che-core-git-impl-jgit Revert Git revert action (#6470) 2017-09-27 15:21:46 +00:00
che-core-ssh-key-ide Merge branch 'master' into spi 2017-09-21 09:24:39 +03:00
che-core-ssh-key-server RELEASE: Set next development version (#6345) 2017-09-19 14:52:53 +03:00
che-wsagent-core Merge branch 'master' into spi 2017-09-21 09:24:39 +03:00
wsagent-local RELEASE: Set next development version (#6345) 2017-09-19 14:52:53 +03:00
pom.xml RELEASE: Set next development version (#6345) 2017-09-19 14:52:53 +03:00