You are viewing a plain text version of this content. The canonical link for it is here.
Posted to devnull@infra.apache.org by vl...@apache.org on 2019/06/08 18:42:06 UTC

[jmeter] 02/47: Update branch/trunk history

This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a commit to annotated tag v2_3
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit 5584d828894f7191074ac858f463c6f2d94d1963
Author: Sebastian Bazley <se...@apache.org>
AuthorDate: Sun Sep 9 20:19:34 2007 +0000

    Update branch/trunk history
    
    git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@574070 13f79535-47bb-0310-9956-ffa450edef68
    
    Former-commit-id: a32cb40cb4166ccdb05ddcede9dfe38f0c69f222
---
 STATUS | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/STATUS b/STATUS
index 7cc5309..6097d48 100644
--- a/STATUS
+++ b/STATUS
@@ -2,11 +2,15 @@ STATUS as at September 2007
 ======
 
 SVN status:
-- trunk is outdated, and contains some Java 1.5+ only code
-- branches/rel-2-2 is the current development branch for 2.2.x and 2.3.x (Java 1.4+)
+- trunk is for development of 2.3.1+
+- branches/rel-2-2 is the current development branch for 2.3 final only
 
 Branch history:
-rel-2-1:325546 was copied from trunk:325542
-rel-2-2:413997 was copied from rel-2-1:413996
+--------------
+
+rel-2-1:325546  created from trunk:325542
+rel-2-2:413997  created from rel-2-1:413996
+trunk:574067    moved to     branches/java1.5_prototype-was_trunk:574058
+trunk:574063    created from branches/rel-2-2:574062 
 
 sebb AT apache DOT org
\ No newline at end of file