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
..
che-plugin-docker-client	Merge branch 'master' into spi	2017-09-21 09:24:39 +03:00
che-plugin-docker-machine/src/main/java/org/eclipse/che/plugin/docker/machine/cleaner	Merge remote-tracking branch 'origin/master' into che-multiuser	2017-09-25 15:50:55 +03:00
che-plugin-docker-machine-auth	Merge with master	2017-09-20 11:34:18 +03:00
che-plugin-openshift-client	Merge commit 'da636d181c41a5602dbd5ced28474ad985df49c0' into spi	2017-09-28 12:15:59 +03:00
pom.xml	Merge remote-tracking branch 'origin/che-multiuser' into spi-multiuser	2017-09-28 12:33:07 +03:00