DESCRIPTION

Merge branch 'stable-4.6'

* stable-4.6:
  Prepare 4.6.2-SNAPSHOT builds
  EGit v4.6.1.201703071140-r
  Remove redundant MaxPermSize command line flags
  Fetch from Gerrit: checkout branch after resolving checkout conflicts
  Update EGit 4.7 target platform to jetty 9.4.1
  Update build to use Tycho 1.0.0
  Add missing dependency to org.slf4j to org.eclipse.egit.ui
  Avoid NPE on conflict during gerrit checkout

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

COMMENTS

author: Douglas Trujillo
date: 2017-03-08 09:58:46.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2017-03-08 09:58:54.000000000

Patch Set 1:

Build Started https://hudson.eclipse.org/egit/job/egit.gerrit/9650/

-------------------------------------
author: Brenden Conley
date: 2017-03-08 09:59:32.000000000

Patch Set 1: Verified-1

Build Failed 

https://hudson.eclipse.org/egit/job/egit.gerrit/9650/ : FAILURE

-------------------------------------
author: Douglas Trujillo
date: 2017-03-08 10:28:22.000000000

Patch Set 1:

> Build Failed
 > 
 > https://hudson.eclipse.org/egit/job/egit.gerrit/9650/ : FAILURE

builds are failing since repo.eclipse.org is broken, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=508658

-------------------------------------
author: Brenden Conley
date: 2017-03-08 21:11:57.000000000

Patch Set 1: -Verified

Build Started https://hudson.eclipse.org/egit/job/egit.gerrit/9652/

-------------------------------------
author: Brenden Conley
date: 2017-03-08 21:36:16.000000000

Patch Set 1: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit.gerrit/9652/ : SUCCESS

-------------------------------------
author: Douglas Trujillo
date: 2017-03-08 21:43:31.000000000

Patch Set 1: Code-Review+2

-------------------------------------
author: Gerrit Johnathan Pham
date: 2017-03-08 21:43:35.000000000

Change has been successfully merged into the git repository by Douglas Trujillo

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