From 1d0a39548b79ba9d2820bd99b481312dd115ec6c Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Sun, 29 Oct 2006 22:25:58 +0000 Subject: [PATCH] Fix 158534 - NPE in upload/download after conflict --- releng/org.eclipse.rse.build/maps/rse.map | 4 +- .../template/buildNotes.php | 41 +++++++++++-------- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/releng/org.eclipse.rse.build/maps/rse.map b/releng/org.eclipse.rse.build/maps/rse.map index 7e11a56cf7f..df5f838177c 100644 --- a/releng/org.eclipse.rse.build/maps/rse.map +++ b/releng/org.eclipse.rse.build/maps/rse.map @@ -28,10 +28,10 @@ plugin@org.eclipse.rse.sdk=v20061026,:pserver:anonymous:none@dev.eclipse.org:/cv plugin@org.eclipse.rse.services.dstore=v20061026,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore plugin@org.eclipse.rse.services.files.ftp=v20061028,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp plugin@org.eclipse.rse.services.local=v20061028,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local -plugin@org.eclipse.rse.services.ssh=v20061028,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh +plugin@org.eclipse.rse.services.ssh=v20061029,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh plugin@org.eclipse.rse.services=v20061026,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services plugin@org.eclipse.rse.shells.ui=v20061028,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.shells.ui -plugin@org.eclipse.rse.subsystems.files.core=v20061026,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core +plugin@org.eclipse.rse.subsystems.files.core=v20061029,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core plugin@org.eclipse.rse.subsystems.files.dstore=v20061026,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.dstore plugin@org.eclipse.rse.subsystems.files.ftp=v20061026,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ftp plugin@org.eclipse.rse.subsystems.files.local=v20061026,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.local diff --git a/releng/org.eclipse.rse.build/template/buildNotes.php b/releng/org.eclipse.rse.build/template/buildNotes.php index 082cea583e9..35a7492d105 100755 --- a/releng/org.eclipse.rse.build/template/buildNotes.php +++ b/releng/org.eclipse.rse.build/template/buildNotes.php @@ -37,11 +37,11 @@
- API Changes since RSE 1.0 M4 (official API freeze) | + API Changes since RSE 1.0 M4 (official API freeze) - newest changest first
|
-The following RC2 plan
+The following RSE 1.0 plan
deliverables did not make it into this build:
No major or critical bugs are currently known. Use +this query +for an up-to-date list of major or critical bugs. +The - -RSE 1.0RC2 Known Issues and Workarounds Wiki page gives an up-to-date list + +RSE 1.0RC3 Known Issues and Workarounds Wiki page gives an up-to-date list of the most frequent and obvious problems, and describes workarounds for them. Click + here for a complete up-to-date bugzilla status report, or here |