Commit graph

63 commits

Author SHA1 Message Date
Steve Harris
22bb7ecd33 Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: b8f0635ad6 [formerly b8f0635ad6 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 900b9aadde
2013-03-18 16:52:00 -05:00
David Gillingham
b121f99015 Issue #1759: Convert ifpnetCDF and iscMosaic to use more robust request
implementations, convert request handlers to use new python concurrent
framework, excise GfeScript and GfeScriptExecutor from the system.

Change-Id: I801b7b9812a72fdfc72975a311d8dc3806cda152

Former-commit-id: 7c74510723 [formerly 7c74510723 [formerly edaef1edf93ed7d7f626591ecfd86fb4c76f92e8]]
Former-commit-id: 566927980a
Former-commit-id: 90b8c80837
2013-03-13 17:14:59 -05:00
Dave Hladky
cb5ee4a7b8 Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 38b952a220 [formerly 38b952a220 [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 160e1594b8
2013-03-13 13:56:33 -05:00
Steve Harris
3084a860cd 13.3.1-7 baseline
Former-commit-id: a72254cc75 [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: e12ed113ae
Former-commit-id: 31c0a97dca
2013-03-13 09:50:28 -05:00
Steve Harris
5232592cfa Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java

Former-commit-id: 753a5213ab [formerly 753a5213ab [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]
Former-commit-id: 0cd7e56e65
Former-commit-id: d5bcdb0015
2013-03-12 16:04:23 -05:00
Dave Hladky
29ed641a13 Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227

Former-commit-id: a1006667e0 [formerly a1006667e0 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]
Former-commit-id: 4b08491880
Former-commit-id: 6ea95002de
2013-03-12 15:48:34 -05:00
Steve Harris
c6f379f59a 13.3.1-6 baseline
Former-commit-id: 3a4c7931e1 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 566b677d09
Former-commit-id: 4ed21b702b
2013-03-12 08:35:45 -05:00
David Gillingham
87d4bdd646 Issue #1759: Refactor PurgeGfeGridsRequestHandler and IscMakeRequestHandler to not use
GfeScriptExecutor and GfeScript.

Change-Id: If3c789549a071e54f9020433f6221e688c51c44a

Former-commit-id: 4459ecfa78 [formerly 4459ecfa78 [formerly a3918b30452a829a8f0cd562021959246bf1144a]]
Former-commit-id: 1518c0b53c
Former-commit-id: 251da90765
2013-03-07 17:25:14 -06:00
Steve Harris
46d0c9fcee Merge branch 'omaha_13.3.1' into development
Former-commit-id: d5b80f9225 [formerly d5b80f9225 [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]
Former-commit-id: aa0e9acefd
Former-commit-id: b9563da8a8
2013-03-05 12:29:44 -06:00
David Gillingham
4f6b2ffcff Issue #1447: Initial commit of VTEC table sharing functionality: port A1 changes to
VTECTableSqueeze, port requestAT/sendAT, re-port ingestAT/MergeVTEC, some minor bug fixes to
serverConfig.py, project configs.

Change-Id: Ibecb0aad913845224be1b7dd713e9fefef19d510

Former-commit-id: 50744c1f92 [formerly 50744c1f92 [formerly 1e72fe30d97504f70352a181de35805a197e50f4]]
Former-commit-id: 9351f33c1c
Former-commit-id: 77a3f33fd5
2013-03-01 11:05:02 -06:00
Max Schenkelberg
453ac44050 Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
Amend: Accepted ticket for work, again!  Ensured uframe product project was not deleted

Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719

Former-commit-id: 4ed4ef8d71 [formerly 4ed4ef8d71 [formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]]
Former-commit-id: e0ba97d547
Former-commit-id: 6b1426dd34
2013-02-27 11:50:38 -06:00
Steve Harris
f3c3191a1c Merge branch 'development' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: a0573644c4 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: 2641d578e2
Former-commit-id: 33dd2589f1
2013-02-21 15:41:39 -06:00
Steve Harris
b3b56830b0 13.3.1-1 baseline
Former-commit-id: 71e8990021 [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
2013-02-20 16:19:40 -06:00
Brad Gonzales
b8147737fe Issue #1630 updated chunk size for single dimension chunks.
Amend: check if dataType is vlen_str_type.

Change-Id: Idbd39e8bcd6c2703299277b073e14b106c897ccb

Former-commit-id: 4c706901f8 [formerly 4c706901f8 [formerly 25bd6d76b85b3c857958f1fc5189f9512420daea]]
Former-commit-id: 691b9d7ca2
Former-commit-id: b9b660535c
2013-02-18 09:29:21 -06:00
Richard Peter
b5706ca6cf Merge "Issue #1608 Fixed group deletes in H5pyDataStore.py" into development
Former-commit-id: a40ae4d8b2 [formerly a40ae4d8b2 [formerly 46302aa76056b00ee6a21c8080274ba23d92dcda]]
Former-commit-id: a6fa92923f
Former-commit-id: 5936f671ce
2013-02-15 16:33:00 -06:00
Ben Steffensmeier
f868f66f76 Issue #1614 Refactor data access framework to use single request.
Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798

Former-commit-id: 1393f3e3cf [formerly 1393f3e3cf [formerly 5a9ae7df15633492b0d9fb648876cfb2bb2946b6]]
Former-commit-id: 0933a5f596
Former-commit-id: f0f3c71d50
2013-02-15 11:39:56 -06:00
Ron Anderson
45627edcc7 Issue #1608 Fixed group deletes in H5pyDataStore.py
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a

Former-commit-id: a2a89fb4e7 [formerly a2a89fb4e7 [formerly dc9ac54903107224633b4e18d5caa345649d8266]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: e952a4f179
2013-02-15 09:03:41 -06:00
Ben Steffensmeier
aecc5a69e9 Issue #1614 allow locationNames for grid data access
Change-Id: I5d88708909b8f76ebdf6fac64a330854781ffae2

Former-commit-id: ab319bd3a8 [formerly ab319bd3a8 [formerly 7fe101c9fdb9266cd7c16a6c0a7281b9f9836cc4]]
Former-commit-id: 9b4de367e3
Former-commit-id: 0995024482
2013-02-14 10:07:01 -06:00
Steve Harris
0c128dd8f0 13.2.1-6 baseline
Former-commit-id: d0752de66c [formerly d0752de66c [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]
Former-commit-id: a46e33f06e
Former-commit-id: 30d38334cc
2013-02-07 16:00:39 -06:00
Steve Harris
a74d58ce6f Merge branch '13.2.1_delivery' into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 658bea377b [formerly 658bea377b [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]
Former-commit-id: ec56acde81
Former-commit-id: 6383bf8ed2
2013-01-31 10:19:14 -06:00
Steve Harris
ba97151132 Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
Former-commit-id: 0505ed0a72 [formerly 0505ed0a72 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]
Former-commit-id: 6040272573
Former-commit-id: 513d49939f
2013-01-29 15:57:21 -06:00
Steve Harris
dbaf4a3e39 13.2.1-3 baseline
Former-commit-id: f45120a1f4 [formerly f45120a1f4 [formerly fc7291332a08966a746605aef725e1947ec9643c]]
Former-commit-id: 7a739c6a5b
Former-commit-id: 3edfa1e0be
2013-01-29 15:52:43 -06:00
Steve Harris
27706b8dcb 13.2.1-2 baseline
Former-commit-id: 7a7f7c45ca [formerly 7a7f7c45ca [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]
Former-commit-id: c3e4551dfa
Former-commit-id: 1153d80c5b
2013-01-25 09:07:12 -06:00
Steve Harris
082e66584a 13.2.1-3 baseline
Former-commit-id: 7435527b25 [formerly 7435527b25 [formerly ba03739c3528638c5383528fd64674ae5af1ed64]]
Former-commit-id: 2b6ac028bd
Former-commit-id: cc0fdef15c
2013-01-23 11:24:17 -05:00
Steve Harris
547c1dedd1 13.2.1-2 baseline
Former-commit-id: 83e9157df7 [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 328c6dccad
Former-commit-id: 47cc08ac79
2013-01-23 11:18:44 -05:00
Steve Harris
b03d5ce450 Merge branch '13.2.1_delivery' into development
Former-commit-id: 11b9bfc187 [formerly 11b9bfc187 [formerly 920b282de84def082dac82832d80e67f7bff2b19]]
Former-commit-id: 1af055a04b
Former-commit-id: 29b9077291
2013-01-22 16:45:48 -06:00
Ron Anderson
cb23960f0e Issue #1504 GFE: Model data not always appearing automatically without CAVE restart
Change-Id: I1e52c111ec50a860a226d85bed6f0ab6dfebed58

Former-commit-id: 62671efc2a [formerly 62671efc2a [formerly 1fe63a2d5e20226f6124a9ca27b9f6272c49226c]]
Former-commit-id: 20b0761048
Former-commit-id: 44807ba0d5
2013-01-22 14:47:37 -06:00
Nate Jensen
927f7e853b Merge "Issue #1446 add getLatCoords and getLonCoords to python data access framework" into development
Former-commit-id: e0896d8b5d [formerly e0896d8b5d [formerly 06dfa2bba6f7d061b43783e9029b164ad208b6fe]]
Former-commit-id: ec1d35251c
Former-commit-id: 2a07d5c89f
2013-01-21 11:55:34 -06:00
Matt Nash
2e6ba707e9 Issue #1446 add getLatCoords and getLonCoords to python data access framework
Change-Id: I292a9b424cadf3033a861d8a0703b2f02946cd4e

Former-commit-id: af22cf8929 [formerly af22cf8929 [formerly 30ffd1412f3b193ce1fe2560f2ecf29027e7f619]]
Former-commit-id: b84af90fc2
Former-commit-id: 177d02d01b
2013-01-21 11:51:18 -06:00
Bryan Kowal
75d8250852 Issue #1490 - updated edex-environment
- actually include the modified files in the commit this time

- each edex environment will now receive its own instance of pypies
- a httpd-pypies port and a pypies logging port must now be specified when creating an edex environment
- the location of the pypies configuration file is no longer hard-coded; specified as an environment variable
- made the pypies tcp logging port configurable
- add source headers
- the configuration will now update the ServerRoot

Change-Id: Ie4130caad91f027c9ab547806fb014c0e708596d

Former-commit-id: b4964c0a19 [formerly b4964c0a19 [formerly c96d7532679555f3ccf8a0d7bc07866e63ac177f]]
Former-commit-id: 9e33969536
Former-commit-id: b47d484e70
2013-01-18 12:44:37 -06:00
Bryan Kowal
290167ac16 Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict.
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3

Former-commit-id: e2a12845d3 [formerly e2a12845d3 [formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]
Former-commit-id: 4db9c6c321
Former-commit-id: c1330e8121
2013-01-15 14:56:01 -06:00
Nate Jensen
d16264c05b Issue #1446 Initial python within Jep implementation of data access framework
Change-Id: I7b6ddb25f0ec68419aab7e40f15f94cd16e155b8

Former-commit-id: e5237fceac [formerly e5237fceac [formerly 1c5339c02a8570e12f92559a3159006efdf0df77]]
Former-commit-id: 12e0a100c4
Former-commit-id: aaa442212a
2013-01-15 13:48:04 -06:00
Steve Harris
b6fa9b4858 13.1.2-2 baseline
Former-commit-id: c0c1d56f3a [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
2013-01-06 14:32:24 -06:00
Bryan Kowal
bf96e5cf59 Issue #1416: added the python package shapely
- shapely and dependencies will now be built as part of the
  32-bit build and the 64-bit build from source
- shapely will also be included as part of the AWIPS II
  MSFT Windows environment


Former-commit-id: 8d1e29448a [formerly 8d1e29448a [formerly 82872ebbfb8f2793fb7d95842d33ba8a0cd41ae6]]
Former-commit-id: 5e22c24657
Former-commit-id: 6103e7c485
2012-12-17 15:27:43 -06:00
Bryan Kowal
f256955776 Issue #1262:
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib
- Updated build-notification.sh for compatibility with automated builds

Change-Id: I4d014e64a014010caa6a89e17ff3edb44000d396

Former-commit-id: 660a9b615f [formerly 660a9b615f [formerly 0c579409321e8be6ea9bf2c98c44769fcdf28dcc]]
Former-commit-id: f39489c44c
Former-commit-id: c44c4bd061
2012-12-16 21:40:26 -06:00
Richard Peter
463f7c5d9b Revert "Issue #1262:"
This reverts commit 83e1f8cc0a [formerly 9490652103] [formerly 0970259114] [formerly a210f08acc [formerly a210f08acc [formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]]


Former-commit-id: 9a7cfa2383 [formerly 9a7cfa2383 [formerly a4e51a9f814ff0e004be46460b6d27a848cb2fe9]]
Former-commit-id: f37f948456
Former-commit-id: 48641ca26f
2012-12-16 20:37:21 -06:00
Richard Peter
e696e879e0 Merge "Issue #1428: Optimize deserialize to directly lookup set method" into development
Former-commit-id: 76e643e876 [formerly 76e643e876 [formerly a5d9b113bbf644a613015fe593f4b9d4070ab167]]
Former-commit-id: b0d47ed420
Former-commit-id: 0295be792f
2012-12-14 17:38:41 -06:00
Richard Peter
a754bee29d Issue #1428: Optimize deserialize to directly lookup set method
Change-Id: I8efb8ea6d67a42e5e2b1f2e6587a2fcd785df914

Former-commit-id: a4d36258d0 [formerly a4d36258d0 [formerly 33ecdcf14de180606cb487e13aa940e913a8a405]]
Former-commit-id: 061104acf1
Former-commit-id: 279fb8d21f
2012-12-14 17:37:50 -06:00
Bryan Kowal
83e1f8cc0a Issue #1262:
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib


Former-commit-id: a210f08acc [formerly a210f08acc [formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]
Former-commit-id: 0970259114
Former-commit-id: 9490652103
2012-12-13 12:40:31 -06:00
Richard Peter
bf19dcd216 Issue #1421: Make hdf5 and database purge the same, update H5pyDataStore
Change-Id: I9cbe9c5cb185b4eb999b0c0a2d6ff6b6d754d0e7

Former-commit-id: 513dd75a23 [formerly 513dd75a23 [formerly fb25e736d298225d217a1775891a65de7e0bd50c]]
Former-commit-id: 08919e73c3
Former-commit-id: f7859723e5
2012-12-13 11:02:07 -06:00
Richard Peter
a0827f476e Issue #1332: Update pypies to create/use condensed group structure
Change-Id: I2e7311b063df1a217a2fe37c0e470272e4e85e92

Former-commit-id: c72c0b9f98 [formerly c72c0b9f98 [formerly 90f3cac62473c66dcdef73a6a605becf08868316]]
Former-commit-id: dbe4290f45
Former-commit-id: 2b3f0a2938
2012-11-21 15:27:31 -06:00
Richard Peter
cd85a43b4a Issue #1332: Update pypies createStorageRecord to not pull in parent group node
Change-Id: Ieb4b45bce2f5c0eca41301eacbd7782b3c310edd

Former-commit-id: 73c2fa6ed3 [formerly 73c2fa6ed3 [formerly 926250abd96f2b5e30b6a863735a10203491a257]]
Former-commit-id: d2aff4118b
Former-commit-id: 859d3840bb
2012-11-14 12:51:53 -06:00
Steve Harris
a5be98d6de 12.12.1-1 baseline
Former-commit-id: e4bd20a515 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e1498006c7
Former-commit-id: 214fcd3b63
2012-11-07 12:41:20 -06:00
David Gillingham
fc56b970ff Issue #1310: Fix automated tropical testing support code after Data Delivery and Unified Grid
baseline merges.

Change-Id: Ia134ecd68c1468b281e7dca6e56f5cbc20047583

Former-commit-id: 0f13b5d0b1 [formerly 0f13b5d0b1 [formerly 0c3a35f339819afc5ed79202c95215ed90890df8]]
Former-commit-id: ec7a7c1373
Former-commit-id: f998d419d9
2012-11-02 15:21:30 -05:00
Steve Harris
dff8d5de9c 12.11.1-5 baseline
Former-commit-id: 03f3f3c36a [formerly 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]
Former-commit-id: a0eaf651ff
Former-commit-id: e31c1e5bba
2012-10-18 15:46:42 -05:00
Richard Peter
dedb7772fd Issue #1257: pypies add base group if not specified
Change-Id: I3c770b63546790c0ae681e5abce78d117d502d0d

Former-commit-id: f8f1c4b67a [formerly f8f1c4b67a [formerly 510404856e79373c9895bda235e434afbbcd71ed]]
Former-commit-id: cd3ad6cb4a
Former-commit-id: a1deadef0d
2012-10-15 16:11:42 -05:00
Richard Peter
881582885c Issue #1257: Change Radar and GFE hdf5 file layouts. Update PluginDao to use ThreadLocal for date formatting instead of sync blocks. Fix for NSharp with different grid path.
Change-Id: I426718d765dfad3aba24e504b2d01ab9b194625f

Former-commit-id: ca0c9b7502 [formerly ca0c9b7502 [formerly 535a9c40538da25dd493c7bdfa6a731160819f85]]
Former-commit-id: bcb0560291
Former-commit-id: ce85c8e1a6
2012-10-15 09:52:14 -05:00
Richard Peter
158098bb4a Issue #1257: Fix for specifying no group. Should have returned root group
Change-Id: Id197fd6d121cc152c7d8b64a474ab018087ab112

Former-commit-id: a03cafd9a5 [formerly a03cafd9a5 [formerly a21b949c55f7d83832bbec3427a3e5971c695114]]
Former-commit-id: e17446851b
Former-commit-id: 0c3ba259b3
2012-10-10 13:38:46 -05:00
Richard Peter
bc589fbdb3 Issue #1257: Update pypies group referencing and enable compression for radar and vil
Change-Id: Ib75b9fec9293f858b638f5eb61140da575909a34

Former-commit-id: f2ac3dc537 [formerly f2ac3dc537 [formerly bbca9f1eb7b3bc568ab3cabc9ad83510afd7317f]]
Former-commit-id: c2a46e0b35
Former-commit-id: bb723dc404
2012-10-09 17:21:56 -05:00
David Gillingham
e488b92b68 Issue #1236: Merge tropical automated testing changes from old git repo to common baseline.
Change-Id: I820b4e09482b52ecd42252bec7eb95c1db741c95

Former-commit-id: e27be9180b [formerly e27be9180b [formerly b64085fb436bb8347c3bff529f1c421c665c6438]]
Former-commit-id: f17309d5f7
Former-commit-id: cb7b660c77
2012-10-02 14:11:32 -05:00