Commit graph

1845 commits

Author SHA1 Message Date
Dustin Johnson
547362b6bb Issue #1543 Add ability to save/read dods files back to net.dods
Change-Id: Icca189f4c3716d4045798d88a6e6ce7d27d46fcf

Former-commit-id: efe1bcc4b5 [formerly cd381cb819] [formerly efe1bcc4b5 [formerly cd381cb819] [formerly febe492056 [formerly d93464273e905ecbb834d7aeaccf477b42e495a3]]]
Former-commit-id: febe492056
Former-commit-id: c81cb3d60b [formerly fffbb32775]
Former-commit-id: 999f3cbcd5
2013-02-05 14:07:30 -06:00
Nate Jensen
32bd4081c5 Merge "Issue #1567 refactor updates of plots for efficiency/clarity" into development
Former-commit-id: 317e225992 [formerly 532bec2967] [formerly 317e225992 [formerly 532bec2967] [formerly 0a64da0b72 [formerly e41fb23e150d4c447823593016a698dabcb8fae5]]]
Former-commit-id: 0a64da0b72
Former-commit-id: 956b1c57db [formerly d6de86b57b]
Former-commit-id: 80b1d80da9
2013-02-05 13:21:21 -06:00
Nate Jensen
353f7f513d Issue #1567 refactor updates of plots for efficiency/clarity
Change-Id: Id3d52ef2eb671138c078bc721c690867ba3dada3

Former-commit-id: 48a503e3dd [formerly b9b730aac5] [formerly 48a503e3dd [formerly b9b730aac5] [formerly 2a3f3e6a40 [formerly b2788eb6bbc807d6fecc8e097e15dfbcb3ff8105]]]
Former-commit-id: 2a3f3e6a40
Former-commit-id: 029aa60957 [formerly a56d672039]
Former-commit-id: fce50aaf62
2013-02-05 11:07:21 -06:00
Richard Peter
7fbd24e723 Merge "Issue #1576 - updated qpid 0.18 rpms" into development
Former-commit-id: bb317b1acf [formerly 221a6e1ca1] [formerly bb317b1acf [formerly 221a6e1ca1] [formerly b774fadb60 [formerly 16b20a7f05e0a16ef02881a950bd541f7b4a4a1e]]]
Former-commit-id: b774fadb60
Former-commit-id: 2e02b222f2 [formerly fa4dd004f9]
Former-commit-id: b4192e72c8
2013-02-05 09:25:55 -06:00
Richard Peter
916d24b076 Merge "Issue #1517 Added SPC Prob menu changes." into development
Former-commit-id: e4894a01fd [formerly 74b3cc23ff] [formerly e4894a01fd [formerly 74b3cc23ff] [formerly 4170ba9558 [formerly 153173d6f07aaf135be6e5422c893942deef5371]]]
Former-commit-id: 4170ba9558
Former-commit-id: 501e305a66 [formerly a0807f8ecb]
Former-commit-id: a64802277e
2013-02-05 09:23:20 -06:00
Steve Harris
8c01240531 Merge branch '13.2.1_delivery' into development
Former-commit-id: 9595fefb4b [formerly d997d99f05] [formerly 9595fefb4b [formerly d997d99f05] [formerly f380667b34 [formerly 815e8b741b173044f8f20f537674d685b50ed6af]]]
Former-commit-id: f380667b34
Former-commit-id: 24ff063657 [formerly 930f1f13c0]
Former-commit-id: 8470638469
2013-02-04 15:26:44 -06:00
Bryan Kowal
0a74b80f23 Issue #1553 - remove duplicated "image" plugin
Change-Id: Ia0328efb3f45dc233118b7ef209e53b1f4ae1f5e

Former-commit-id: af697a65d1 [formerly 1b7e268feb] [formerly af697a65d1 [formerly 1b7e268feb] [formerly dd6abb0ba1 [formerly a16493410bddeca8982140a3a41922d46ee479b4]]]
Former-commit-id: dd6abb0ba1
Former-commit-id: 32012b9f64 [formerly 7bb3bef057]
Former-commit-id: 45f67cda75
2013-02-04 13:07:35 -06:00
Bryan Kowal
c92b997909 Issue #1576 - updated qpid 0.18 rpms
- the broker-plugins/management-jmx module is now built
- the broker-plugins-management-jmx plugins and the common-management plugins are now included in the rpms

Change-Id: I273772b2fb8f339a55cc3e523f90ca3b2398b222

Former-commit-id: 145cd06eae [formerly 1678618015] [formerly 145cd06eae [formerly 1678618015] [formerly 09523f1e84 [formerly c43c4268ba13e5758dfb4c504d57dead5ae89d63]]]
Former-commit-id: 09523f1e84
Former-commit-id: fe70d57c36 [formerly 513bda11bc]
Former-commit-id: 88d5830873
2013-02-04 12:31:23 -06:00
Nate Jensen
7bbb39b569 Issue #1553 fix build
Change-Id: Ia716b2bd6ecd3c8e045ad91c4c3ca063690b91c3

Former-commit-id: f044441759 [formerly ea6dec5db8] [formerly f044441759 [formerly ea6dec5db8] [formerly dd854cdb85 [formerly d46cda9c95a94572fa2e6c89ed4298a55cf76e15]]]
Former-commit-id: dd854cdb85
Former-commit-id: 53bf879c83 [formerly d15a57427e]
Former-commit-id: 77a1ecc998
2013-02-04 09:34:40 -06:00
Brad Gonzales
7253bbf20e Issue #1517 Added SPC Prob menu changes.
Amend: Moved derived parameter files to cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/
       Moved Spc.ppy to edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/
       Updated units in spcGuideNDFD.xml.
       Removed local configuration menu items and tags.
       Updated pqact.conf.template SPC entry.
       Update SPC.py with levels.

Change-Id: I0f7a148d5e122b26c125bfee110019d5f577bdc1

Former-commit-id: 35cc853c74 [formerly f459554e33] [formerly 35cc853c74 [formerly f459554e33] [formerly 5bc6dd5498 [formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]]
Former-commit-id: 5bc6dd5498
Former-commit-id: 8fc5c18ebd [formerly f3ef309293]
Former-commit-id: adbfa7ced1
2013-02-04 08:52:33 -06:00
Nate Jensen
9837ce9241 Merge "Issue #1553 move radar units into common plugin for use in data access factory Change-Id: I32d01625bcbc6555b402048ebb34cee21f0b855f" into development
Former-commit-id: d7677be8a4 [formerly f77a1dc85c] [formerly d7677be8a4 [formerly f77a1dc85c] [formerly e1166c246c [formerly 358b990e43d0f5952ee3c33521778541bd1b7c04]]]
Former-commit-id: e1166c246c
Former-commit-id: d996064b91 [formerly 3ab7c693de]
Former-commit-id: 029b031536
2013-02-01 15:01:24 -06:00
Ben Steffensmeier
491d2c3e63 Issue #1575 apply persisted colormap attributes to grid resources
Former-commit-id: f8b9b2c987 [formerly 07d053bb3c] [formerly f8b9b2c987 [formerly 07d053bb3c] [formerly 1884c77278 [formerly 4bb77ee1763890a355a0ac5eefb8c14c12e13780]]]
Former-commit-id: 1884c77278
Former-commit-id: 16be5e1ab5 [formerly a2a95a17aa]
Former-commit-id: bda67a7d70
2013-02-01 12:45:39 -06:00
Roger Ferrel
3f8b7c2274 Issue #1496 Place finally on Jobs to always clean up properly.
Change-Id: I7923482fae1dff2f467605655582f96768146008

Former-commit-id: 87ea06dfa3 [formerly fa84461ac9] [formerly 87ea06dfa3 [formerly fa84461ac9] [formerly fe0761d2de [formerly c25a296b3362159230f1020b9800cc0b75d83b61]]]
Former-commit-id: fe0761d2de
Former-commit-id: 5328956362 [formerly 37f6ac440f]
Former-commit-id: f4adecb7c0
2013-02-01 10:28:06 -06:00
Ben Steffensmeier
04e0c7ca48 Issue #1553 fix RenderableTileSet for round projections.
Former-commit-id: f3aa9d3ba4 [formerly 1e6d6ac799] [formerly f3aa9d3ba4 [formerly 1e6d6ac799] [formerly f31215a999 [formerly 8bd997f193b4a8cc75fc6609b321b29f2524c08b]]]
Former-commit-id: f31215a999
Former-commit-id: 90070b40d2 [formerly 8c3deb1a93]
Former-commit-id: 77463bf7fa
2013-01-31 17:17:30 -06:00
Ben Steffensmeier
2334bfef69 Issue #1553 move radar units into common plugin for use in data access factory
Change-Id: I32d01625bcbc6555b402048ebb34cee21f0b855f

Former-commit-id: e9d3c547ff [formerly 057654103d] [formerly e9d3c547ff [formerly 057654103d] [formerly 54d91281a6 [formerly c9faa8b98ce3687667363841f5955d8aebab6b1e]]]
Former-commit-id: 54d91281a6
Former-commit-id: df823559eb [formerly 8442c27bc6]
Former-commit-id: bbdd86c866
2013-01-31 17:15:11 -06:00
Steve Harris
e32a6d6364 Merge branch '13.2.1_delivery' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into 13.2.1_delivery
Former-commit-id: e173b1caf7 [formerly 2117c3905f] [formerly e173b1caf7 [formerly 2117c3905f] [formerly 5966741649 [formerly 3008b5145d81fd940bed26cf96bfeaa42505e830]]]
Former-commit-id: 5966741649
Former-commit-id: c5dce3cc06 [formerly 8a2ee0ce90]
Former-commit-id: bacc980b63
2013-01-31 16:20:45 -06:00
Roger Ferrel
c608b96ce4 Issue #1568 Changed spell checkers shell.
Change-Id: If7fe987b46204d9edf89a0a0c461a4444320d265

Former-commit-id: 83f077a426 [formerly e3c047c96d] [formerly 83f077a426 [formerly e3c047c96d] [formerly fd04707b7d [formerly 5444ec7e59a1499114b2d138e90f2c888aaf6e6c]]]
Former-commit-id: fd04707b7d
Former-commit-id: 6495252989 [formerly 9183e40c5f]
Former-commit-id: bdf6be59cc
2013-01-31 16:08:54 -06:00
Jonathan Sanchez
0f441e63c7 Issue #1557 Added allowDuplicates XML element to point source configuration.
Change-Id: I20a05413ef93c4b1268a5b9d3d5541375a47523b

Former-commit-id: b2870a012e [formerly da1061baa6] [formerly b2870a012e [formerly da1061baa6] [formerly f72968824a [formerly 945b2e64b971fc31691d550e6c629f43db9a9c99]]]
Former-commit-id: f72968824a
Former-commit-id: ed42a6d939 [formerly 53eddc3ec8]
Former-commit-id: aec55e410f
2013-01-31 16:01:04 -06:00
Nate Jensen
8f195e0a7e Merge "Issue #1564 correct mosaic ordered shader shader." into development
Former-commit-id: 6aecbaef5b [formerly dcc3c43454] [formerly 6aecbaef5b [formerly dcc3c43454] [formerly 4f7b9dee8b [formerly 7ad29b0c523ec431d91f2a0340f4fc635564493d]]]
Former-commit-id: 4f7b9dee8b
Former-commit-id: 3e7349e404 [formerly 6154c18856]
Former-commit-id: 8858e72966
2013-01-31 15:57:55 -06:00
Lee Venable
57443eb443 Merge "Issue #1557 Added allowDuplicates XML element to point source configuration. Change-Id: I20a05413ef93c4b1268a5b9d3d5541375a47523b" into development
Former-commit-id: bc4b462c69 [formerly 3cc2665f41] [formerly bc4b462c69 [formerly 3cc2665f41] [formerly f2e7f7ff1b [formerly a7e3ea831a4cbd3e5ab04f3288b8eac8f74f70f3]]]
Former-commit-id: f2e7f7ff1b
Former-commit-id: f192004c51 [formerly 16bc40cec8]
Former-commit-id: f5919fdf64
2013-01-31 15:54:05 -06:00
Nate Jensen
7b3f056fa9 Merge "Issue #1558 Fixed RotatePanelsHandler so it functions correctly when rotating from 4-1 panel" into development
Former-commit-id: 3daf6649dd [formerly a4255d89ae] [formerly 3daf6649dd [formerly a4255d89ae] [formerly 84a25b2c19 [formerly 429d48bfcc56a96b4ef4d0a2c498cf51d661973d]]]
Former-commit-id: 84a25b2c19
Former-commit-id: 74043613ed [formerly e2992d6344]
Former-commit-id: ff2d324817
2013-01-31 15:41:47 -06:00
Max Schenkelberg
23a67773f6 Issue #1558 Fixed RotatePanelsHandler so it functions correctly when rotating from 4-1 panel
Change-Id: I39f6d119360b6c43b2ba4667321e4119d312f721

Former-commit-id: d0c9157e2a [formerly ed4a9023da] [formerly d0c9157e2a [formerly ed4a9023da] [formerly 95d3706969 [formerly b5f53d6b332c8f4b24462d0d42ff1d07cb31830b]]]
Former-commit-id: 95d3706969
Former-commit-id: a1d92fa99f [formerly 0f9f51fb14]
Former-commit-id: 621f71977e
2013-01-31 15:34:46 -06:00
Ben Steffensmeier
c78627f525 Issue #1564 correct mosaic ordered shader shader.
Former-commit-id: 153b826ca9 [formerly ebae642c8a] [formerly 153b826ca9 [formerly ebae642c8a] [formerly 9bf9b1cc0d [formerly 514ae219a7e986ca420d28a0c480de4c4d31bbdb]]]
Former-commit-id: 9bf9b1cc0d
Former-commit-id: 723c4c87a7 [formerly c43bd1a5ab]
Former-commit-id: e57e54dbba
2013-01-31 15:26:16 -06:00
Nate Jensen
2ddb12e9ab Merge "Issue #1562 Made topo create colormap parameters off existing ones and moved to new tileset API" into development
Former-commit-id: 1928c8a329 [formerly 3f5e7f4eee] [formerly 1928c8a329 [formerly 3f5e7f4eee] [formerly fb122159c8 [formerly 2063a0d927451764f622e5fa08bff52bef124c14]]]
Former-commit-id: fb122159c8
Former-commit-id: 68d20efc52 [formerly 346ca8be1c]
Former-commit-id: e8860fd628
2013-01-31 15:25:49 -06:00
Bryan Kowal
fa38db1d45 Merge "Issue #1551 - adding maps to the Data Access Framework" into development
Former-commit-id: 776e7ab5c2 [formerly f585de398b] [formerly 776e7ab5c2 [formerly f585de398b] [formerly 73cf3ac730 [formerly d722b34158a74e922025804a2f0953226aae7a98]]]
Former-commit-id: 73cf3ac730
Former-commit-id: 6027369645 [formerly a65ccede20]
Former-commit-id: 59cbe4be3f
2013-01-31 15:24:30 -06:00
Jonathan Sanchez
db72c21e73 Issue #1557 Added allowDuplicates XML element to point source configuration.
Change-Id: I20a05413ef93c4b1268a5b9d3d5541375a47523b

Former-commit-id: c6a47fe8c9 [formerly 55b12dae25] [formerly c6a47fe8c9 [formerly 55b12dae25] [formerly ed0bce744e [formerly 9ba75c5a838b95ff09a64929c97492b97f4729f1]]]
Former-commit-id: ed0bce744e
Former-commit-id: 8d3188713b [formerly c8b8981804]
Former-commit-id: e3d4a66310
2013-01-31 15:11:17 -06:00
Benjamin Phillippe
c72a037691 Issue #1525 Data Discovery Browser Performance
Change-Id: I1b5405e52fa8462b562e8a56b2e544d96e9ad0f3

Former-commit-id: 25b05eada7 [formerly acb6889b1d] [formerly 25b05eada7 [formerly acb6889b1d] [formerly 9806387a8b [formerly 495a30e31a16f0c595c35555e4d804585dcb5a96]]]
Former-commit-id: 9806387a8b
Former-commit-id: d68bb6da0d [formerly db40c02bbf]
Former-commit-id: 182df430f4
2013-01-31 14:43:26 -06:00
Roger Ferrel
f21a381e12 Issue #1563 Changes to force location of tooltip and always get the information for the line under the cursor.
Change-Id: I45b35e1db38335e6931086c99dbf3573a26f832b

Former-commit-id: 7dec3e3cd2 [formerly cbdf7e5e05] [formerly 7dec3e3cd2 [formerly cbdf7e5e05] [formerly 647f1e4da0 [formerly cd936e54aca3ef6a20ecd5c8b95e256b2443b907]]]
Former-commit-id: 647f1e4da0
Former-commit-id: e94e0b84f7 [formerly 09d83a2903]
Former-commit-id: 8cf617bd4c
2013-01-31 14:26:51 -06:00
Max Schenkelberg
5f2bc20ff7 Issue #1562 Made topo create colormap parameters off existing ones and moved to new tileset API
Change-Id: Iba534200e893a0e4febc2b14ec0161e2d8b0e6d3

Former-commit-id: 817bfcdb4b [formerly 44b3876738] [formerly 817bfcdb4b [formerly 44b3876738] [formerly a3efce7917 [formerly 51ad0f0a990f1238ba0ba01491e155eb5efb6012]]]
Former-commit-id: a3efce7917
Former-commit-id: 1ef69cd6e6 [formerly 0f4fbf614e]
Former-commit-id: 08015d63e0
2013-01-31 14:26:06 -06:00
David Gillingham
54e5481d09 Issue #1559: Fix port error in SmartScript.getGridCellSwath().
Change-Id: If435423a8277f852b3ceb0a7299332ece800696f

Former-commit-id: 6f6534649a [formerly 292bd811a0] [formerly 6f6534649a [formerly 292bd811a0] [formerly 49a4e1c39d [formerly 2e2be1d031a93f0fe13c17788eabff34ab428caa]]]
Former-commit-id: 49a4e1c39d
Former-commit-id: 3a13421305 [formerly 62f30014f0]
Former-commit-id: d8eb0b96dd
2013-01-31 12:00:38 -06:00
Steve Harris
2107a54161 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: c218786986 [formerly 658bea377b] [formerly c218786986 [formerly 658bea377b] [formerly ec56acde81 [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]]
Former-commit-id: ec56acde81
Former-commit-id: 73d9455c65 [formerly 6383bf8ed2]
Former-commit-id: a74d58ce6f
2013-01-31 10:19:14 -06:00
Bryan Kowal
df8f224bde Issue #1551 - adding maps to the Data Access Framework
- initial commit of Maps Geometry Factory
- re-factored geometry factory code
- addressing peer review comments
- cast to Timestamp

Change-Id: Ie12177b5ae1a8d8d9151d061682730841cfcc807

Former-commit-id: 6ea0653c78 [formerly 964b30d5f2] [formerly 6ea0653c78 [formerly 964b30d5f2] [formerly 5d83f9f3d1 [formerly 8155a2cc6dc16df4addf5b567c08890278dc48c3]]]
Former-commit-id: 5d83f9f3d1
Former-commit-id: 0557ecfed3 [formerly e86fda2a6f]
Former-commit-id: c4e18dd6e6
2013-01-31 10:03:10 -06:00
Dustin Johnson
ba39807ebe Issue #1501 Fix broken required latency calculations
Change-Id: If91a567b2a215ec039f5649b4a77939a8fd9b45a

Former-commit-id: e64e36ecf2 [formerly f361f5a6a1] [formerly e64e36ecf2 [formerly f361f5a6a1] [formerly 5830a98a51 [formerly 9788de6b75f727ea1c2d7c178081eeec16078362]]]
Former-commit-id: 5830a98a51
Former-commit-id: 0185add187 [formerly d7077690d8]
Former-commit-id: 74f27ce9f8
2013-01-31 08:39:08 -06:00
Mike Duff
7b6f64506a Issue #1560 - TS Graphs refresh data on page up/down.
Former-commit-id: 24e9ae73f0 [formerly fc24735297] [formerly 24e9ae73f0 [formerly fc24735297] [formerly f03e9cc5ce [formerly 272894304774c8446ac6476cd9edcb8e212ffb19]]]
Former-commit-id: f03e9cc5ce
Former-commit-id: f5ef2dc1fe [formerly a51d48db5e]
Former-commit-id: a0e2621664
2013-01-30 16:38:04 -06:00
Nate Jensen
283bffe639 Merge "Issue #1534 Check for null in initInternal to avoid exception" into 13.2.1_delivery
Former-commit-id: 8d07de6933 [formerly a0856d2f26] [formerly 8d07de6933 [formerly a0856d2f26] [formerly ca2d99c69a [formerly a89274c821276c8a5ef3b08a8c25aa03c391b766]]]
Former-commit-id: ca2d99c69a
Former-commit-id: 28535058f9 [formerly 1fa3c9cb3c]
Former-commit-id: 47c0e7bb04
2013-01-30 15:02:45 -06:00
Nate Jensen
c45484d7d9 Merge "Issue #1521 add extra validation and checks to grid factory Change-Id: If7903f96bad2d21e9e9eaea86fa5ccc9b9374c9c" into development
Former-commit-id: f1cf8bff45 [formerly 88b52e25f2] [formerly f1cf8bff45 [formerly 88b52e25f2] [formerly b765544b40 [formerly af723dd7ec322d586b7eb48381105c1043f32e67]]]
Former-commit-id: b765544b40
Former-commit-id: 2db9dc1130 [formerly 8952df8497]
Former-commit-id: fc60602a5d
2013-01-30 15:01:19 -06:00
Roger Ferrel
0d56bd5b25 Issue #1496 Changes to allow multiple query jobs. (Reduced long queries from 30 to 5 seconds.)
Changes to use fewer synchronized blocks.

Change-Id: I854a5ff9d34be63e46d26f3d78953bc3b8cc796a

Former-commit-id: 97b6a1a810 [formerly 7a7f86bfe6] [formerly 97b6a1a810 [formerly 7a7f86bfe6] [formerly fbcc5fb9a0 [formerly 7adb742310b662763315fc721d6d6f326b8ba160]]]
Former-commit-id: fbcc5fb9a0
Former-commit-id: 234b632c75 [formerly 4dbb053d65]
Former-commit-id: 82b029928e
2013-01-30 13:11:56 -06:00
Max Schenkelberg
7e999f018b Issue #1534 Check for null in initInternal to avoid exception
Change-Id: I9ccf341c3c04f08f88e5366009771f9cda510119

Former-commit-id: a574e13562 [formerly 5ed30a723e] [formerly a574e13562 [formerly 5ed30a723e] [formerly 23e3ad2382 [formerly 77d0d92f23325407292c5a048ba1276e7e0568ad]]]
Former-commit-id: 23e3ad2382
Former-commit-id: 50deaaaa79 [formerly 296186190a]
Former-commit-id: 74aa120014
2013-01-30 11:34:19 -06:00
Steve Harris
2374e69640 Issue #1542 throw out non-watches in watches resource
Former-commit-id: b651007bc7 [formerly 2f5d5f08ae] [formerly b651007bc7 [formerly 2f5d5f08ae] [formerly 97bd112438 [formerly e719c4112920802a7457ced7836a1c4a42140400]]]
Former-commit-id: 97bd112438
Former-commit-id: fbbf2f3cda [formerly 50565fee11]
Former-commit-id: dd7b9e1cf8
2013-01-30 11:26:20 -06:00
Ben Steffensmeier
31e9b542c1 Issue #1521 add extra validation and checks to grid factory
Change-Id: If7903f96bad2d21e9e9eaea86fa5ccc9b9374c9c

Former-commit-id: 9f5a0a1f58 [formerly 52337a2e6e] [formerly 9f5a0a1f58 [formerly 52337a2e6e] [formerly 437e6ae690 [formerly 3023799852acfb932f2afcb0c4ed1cf764add776]]]
Former-commit-id: 437e6ae690
Former-commit-id: dcb8a26ca2 [formerly 449dcb2df2]
Former-commit-id: c5ff5a6f61
2013-01-29 17:37:39 -06:00
Max Schenkelberg
a0a6d4f799 Issue #1541 Fixed tool activation so always happens in part activated/deactivated listener.
Change-Id: I515bfe867c4ad9c74280173badae408d0ee5dab9

Former-commit-id: eaae098e29 [formerly 4fae854006] [formerly eaae098e29 [formerly 4fae854006] [formerly ad37f68537 [formerly c0f98136403a05755d1c7c640f264f1bafe64a4f]]]
Former-commit-id: ad37f68537
Former-commit-id: 88d5c2f793 [formerly 9d2a960cb4]
Former-commit-id: 2852e10076
2013-01-29 17:33:11 -06:00
Lee Venable
3de54778b2 Merge "Issue #1495 add ensemble to Subscription copy constructor" into 13.2.1_delivery
Former-commit-id: f88f8211e1 [formerly b82909bfb1] [formerly f88f8211e1 [formerly b82909bfb1] [formerly 29a25cbe10 [formerly f895f5b777a8fdb292a20820678417decfd67ff9]]]
Former-commit-id: 29a25cbe10
Former-commit-id: ede2bc6159 [formerly 70ed87a093]
Former-commit-id: 4bf1bf11f3
2013-01-29 16:46:31 -06:00
Lee Venable
0583d980e3 Merge "Issue #1499 Fixed various bugs with Warngen that caused slow initial loading as well as slow interactions. Loaded maps asynchronous and group geometries from table in GeometryCollection instead of unioning into invalid MultiPolygon." into 13.2.1_delivery
Former-commit-id: c9cd8c4c76 [formerly 9f222c9643] [formerly c9cd8c4c76 [formerly 9f222c9643] [formerly 52e10c8c8a [formerly 4e223a32936225205b61e8d9983a9e9e37dd147a]]]
Former-commit-id: 52e10c8c8a
Former-commit-id: 0b005f08fb [formerly 56f4567566]
Former-commit-id: 6668070073
2013-01-29 16:44:53 -06:00
Steve Harris
99bc358644 Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
Former-commit-id: e655d297f7 [formerly 0505ed0a72] [formerly e655d297f7 [formerly 0505ed0a72] [formerly 6040272573 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]]
Former-commit-id: 6040272573
Former-commit-id: 75f6e61e6f [formerly 513d49939f]
Former-commit-id: ba97151132
2013-01-29 15:57:21 -06:00
Steve Harris
9ab34b7aeb 13.2.1-3 baseline
Former-commit-id: 283147571f [formerly f45120a1f4] [formerly 283147571f [formerly f45120a1f4] [formerly 7a739c6a5b [formerly fc7291332a08966a746605aef725e1947ec9643c]]]
Former-commit-id: 7a739c6a5b
Former-commit-id: daca1c3e73 [formerly 3edfa1e0be]
Former-commit-id: dbaf4a3e39
2013-01-29 15:52:43 -06:00
Lee Venable
075a8582e8 Merge "Issue #1535 Fix GFE saving last block of grids twice" into 13.2.1_delivery
Former-commit-id: d6a674189b [formerly 9b793f195b] [formerly d6a674189b [formerly 9b793f195b] [formerly 8195fd7930 [formerly 444a78f0a007038b845946aec9ecfb88b4ae7b63]]]
Former-commit-id: 8195fd7930
Former-commit-id: bc93eff808 [formerly 154b428162]
Former-commit-id: 9843217d41
2013-01-29 14:54:14 -06:00
Ben Steffensmeier
b81b7c0d0e Issue #1495 add ensemble to Subscription copy constructor
Former-commit-id: c81ed396af [formerly d17afdc1fa] [formerly c81ed396af [formerly d17afdc1fa] [formerly 5db16973bd [formerly 9f7a3f505048009e076b81c2be9603cefe62577a]]]
Former-commit-id: 5db16973bd
Former-commit-id: f0fe3654c7 [formerly daf368ef21]
Former-commit-id: 703fa6695e
2013-01-29 13:42:01 -06:00
Mike Duff
45b5ce4fd6 Issue #1523 - Fix for count unit label.
Change-Id: Icc705a4bff143734b61fd11b8edc4d6337647015

Former-commit-id: ea5d953e80 [formerly 2772f83fc7] [formerly ea5d953e80 [formerly 2772f83fc7] [formerly 5cab77afb3 [formerly 5a3facb0b4cb6c15a458a44f97fe4ffece505523]]]
Former-commit-id: 5cab77afb3
Former-commit-id: 26768cd96d [formerly 9ff30b4934]
Former-commit-id: 18ac9ff2d3
2013-01-29 13:12:40 -06:00
Richard Peter
5deeb0fb6f Merge "Issue #1537 - fixed the edex-environment build" into development
Former-commit-id: 7fb59536c9 [formerly 36272799c6] [formerly 7fb59536c9 [formerly 36272799c6] [formerly b5b1ea923a [formerly aa7edb8004479dd71fb3863392ec78eb6830e657]]]
Former-commit-id: b5b1ea923a
Former-commit-id: 28c56766fb [formerly fa22dd1557]
Former-commit-id: 2826f3469d
2013-01-29 10:34:20 -06:00
Richard Peter
5a9287ceda Merge "Issue #1526 improved exception handling per code review comments" into development
Former-commit-id: 565fbd1630 [formerly 80a750a72a] [formerly 565fbd1630 [formerly 80a750a72a] [formerly a23fa4a1ae [formerly bb9789c558f6abf2f75a146edc7a197784e3711b]]]
Former-commit-id: a23fa4a1ae
Former-commit-id: b9b92baa12 [formerly 641ae0393a]
Former-commit-id: 95d14fbdf0
2013-01-29 10:29:00 -06:00