r14417 - in /branches/gui_testing: ./ docs/CHANGES docs/Release_Checklist multi/__init__.py -- August 24, 2011 - 12:01

Author: bugman
Date: Wed Aug 24 12:01:04 2011
New Revision: 14417

URL: http://svn.gna.org/viewcvs/relax?rev=14417&view=rev
Log:
Merged revisions 14406,14409,14416 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r14406 | bugman | 2011-08-22 15:52:29 +0200 (Mon, 22 Aug 2011) | 3 lines
  
  Updated the multi package __all__ list to include the multi_processor 
module.
........
  r14409 | bugman | 2011-08-22 17:37:30 +0200 (Mon, 22 Aug 2011) | 6 lines
  
  Merged the CHANGES file for relax version 1.3.12 back into the main 1.3 
line.
  
  The command used was:
  svn merge -r14407:14408 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/tags/1.3.12
........
  r14416 | bugman | 2011-08-23 20:12:08 +0200 (Tue, 23 Aug 2011) | 3 lines
  
  Updated the release checklist with a few additional shell commands to 
clarify.
........

Modified:
    branches/gui_testing/   (props changed)
    branches/gui_testing/docs/CHANGES
    branches/gui_testing/docs/Release_Checklist
    branches/gui_testing/multi/__init__.py

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Aug 24 12:01:04 2011
@@ -1,1 +1,1 @@
-/1.3:1-14404
+/1.3:1-14416

Modified: branches/gui_testing/docs/CHANGES
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/docs/CHANGES?rev=14417&r1=14416&r2=14417&view=diff
==============================================================================
--- branches/gui_testing/docs/CHANGES (original)
+++ branches/gui_testing/docs/CHANGES Wed Aug 24 12:01:04 2011
@@ -1,3 +1,18 @@
+Version 1.3.12
+(22 August 2011, from /1.3)
+http://svn.gna.org/svn/relax/tags/1.3.12
+
+    Features:
+        * The multi-processor capabilities of Gary Thompson's multi package 
including both uniprocessor and mpi4py modes.
+
+    Changes:
+        N/A
+
+    Bugfixes:
+        N/A
+
+
+
 Version 1.3.11
 (12 August 2011, from /1.3)
 http://svn.gna.org/svn/relax/tags/1.3.11

Modified: branches/gui_testing/docs/Release_Checklist
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/docs/Release_Checklist?rev=14417&r1=14416&r2=14417&view=diff
==============================================================================
--- branches/gui_testing/docs/Release_Checklist (original)
+++ branches/gui_testing/docs/Release_Checklist Wed Aug 24 12:01:04 2011
@@ -70,6 +70,7 @@
 * Build other distribution packages by checking out the tag and bundling 
minfx and bmrblib.:
 
 $ svn co svn+ssh://bugman@xxxxxxxxxxx/svn/relax/tags/1.3.1
+$ cd 1.3.1
 $ svn co svn+ssh://bugman@xxxxxxxxxxx/svn/minfx/trunk/minfx
 $ svn co svn+ssh://bugman@xxxxxxxxxxx/svn/bmrblib/trunk/bmrblib
 $ scons binary_dist key=xxxxx
@@ -77,6 +78,7 @@
 Or:
 
 $ svn co http://svn.gna.org/svn/relax/tags/1.3.1
+$ cd 1.3.1
 $ svn co http://svn.gna.org/svn/minfx/trunk/minfx
 $ svn co http://svn.gna.org/svn/bmrblib/trunk/bmrblib
 $ scons binary_dist

Modified: branches/gui_testing/multi/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/multi/__init__.py?rev=14417&r1=14416&r2=14417&view=diff
==============================================================================
--- branches/gui_testing/multi/__init__.py (original)
+++ branches/gui_testing/multi/__init__.py Wed Aug 24 12:01:04 2011
@@ -24,6 +24,7 @@
 
 __all__ = ['commands',
            'mpi4py_processor',
+           'multi_processor',
            'multi_processor_base',
            'processor_io',
            'processor',