DESCRIPTION

Merge branch 'master' into stable-4.0

* master:
  Update 4.5 target platform to use final Mars Orbit repository
  [gitflow] track feature will always claim no remote features exist
  [gitflow] explicitly notify the user about merge/rebase conflicts
  Avoid deadlocks during resource changes in AutoShareProjects
  [gitflow] Fix broken "start release" from commit

Change-Id: I8c1b27babee7323d75694a080307cd1260a62258
Signed-off-by: Douglas Trujillo xxx@xxx.xxx


COMMENTS

author: Douglas Trujillo
date: 2015-06-01 22:20:39.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2015-06-01 22:20:46.000000000

Patch Set 1:

Build Started https://hudson.eclipse.org/egit/job/egit-stable.gerrit/696/

-------------------------------------
author: Brenden Conley
date: 2015-06-01 22:41:26.000000000

Patch Set 1: Code-Review-1

Build Unstable 

https://hudson.eclipse.org/egit/job/egit-stable.gerrit/696/ : UNSTABLE

-------------------------------------
author: Brenden Conley
date: 2015-06-01 22:51:37.000000000

Patch Set 1: -Code-Review

Build Started https://hudson.eclipse.org/egit/job/egit-stable.gerrit/697/

-------------------------------------
author: Brenden Conley
date: 2015-06-01 23:10:49.000000000

Patch Set 1: Code-Review-1

Build Unstable 

https://hudson.eclipse.org/egit/job/egit-stable.gerrit/697/ : UNSTABLE

-------------------------------------
author: Brenden Conley
date: 2015-06-01 23:14:16.000000000

Patch Set 1: -Code-Review

Build Started https://hudson.eclipse.org/egit/job/egit-stable.gerrit/698/

-------------------------------------
author: Douglas Trujillo
date: 2015-06-01 23:14:41.000000000

Patch Set 1: Code-Review+2 Verified+1

-------------------------------------
author: Douglas Trujillo
date: 2015-06-01 23:14:46.000000000

Change has been successfully merged into the git repository.

-------------------------------------
author: Brenden Conley
date: 2015-06-01 23:39:09.000000000

Patch Set 1:

Build Unstable 

https://hudson.eclipse.org/egit/job/egit-stable.gerrit/698/ : UNSTABLE

-------------------------------------
