Commit graph

2241 commits

Author SHA1 Message Date
Richard Peter
c810bf2555 Merge "Issue #2655 fix textlightning distribution regex" into development
Former-commit-id: 172f0a9fa4 [formerly 70e9bef750] [formerly 172f0a9fa4 [formerly 70e9bef750] [formerly 3feee2cf50 [formerly b1ba10c3b69187b762c962801a937adeb6ef5867]]]
Former-commit-id: 3feee2cf50
Former-commit-id: 9d183aaa97 [formerly ca851b6d2e]
Former-commit-id: 06e025de7d
2014-02-12 15:34:43 -06:00
Nate Jensen
7f3016b679 Issue #2655 fix textlightning distribution regex
Change-Id: Ia8900e8baa05d831c984fbf355034ca189364d99

Former-commit-id: cf1dcae597 [formerly a6c562d3f0] [formerly cf1dcae597 [formerly a6c562d3f0] [formerly 16d6a29bb9 [formerly 48825cb03da5bde6f8b1252fe2e366119535f8f3]]]
Former-commit-id: 16d6a29bb9
Former-commit-id: 929d683210 [formerly 3b918cee5f]
Former-commit-id: 72330e9b62
2014-02-12 15:03:45 -06:00
Ron Anderson
79a635bc9e Merge "Issue #2719 Update NHA GFE domain" into omaha_14.2.1
Former-commit-id: 8ba331e7fb [formerly af4f8de839] [formerly 8ba331e7fb [formerly af4f8de839] [formerly d906b780e8 [formerly caf31f2a88227c7ed9141676feb937822f4d03ce]]]
Former-commit-id: d906b780e8
Former-commit-id: 2fdcef7338 [formerly 361881dfda]
Former-commit-id: 2e1f7c8199
2014-02-11 17:16:07 -06:00
Ron Anderson
454ce0268d Issue #2719 Update NHA GFE domain
Change-Id: I081aef85ca4133addfc203473af5c53679c12d1c

Former-commit-id: 0f9b44ff94 [formerly a665530831] [formerly 0f9b44ff94 [formerly a665530831] [formerly ee89463d27 [formerly 28008b46b5d68e544dace5f721b283c222701699]]]
Former-commit-id: ee89463d27
Former-commit-id: 1ca9c95567 [formerly bfa65ed39e]
Former-commit-id: dd597e8349
2014-02-11 17:07:01 -06:00
Brian.Dyke
f47dd3ef59 14.1.1-18 baseline
Former-commit-id: f05a2220cd [formerly 575e328123] [formerly f05a2220cd [formerly 575e328123] [formerly 1d6a9456b7 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]]
Former-commit-id: 1d6a9456b7
Former-commit-id: d61ae6c5f4 [formerly c5857c30f2]
Former-commit-id: d1db845406
2014-02-11 15:52:50 -05:00
Slav Korolev
93db746127 Issue #2763. Made LFCR correction of input data.
Former-commit-id: 633a33dd21 [formerly 43802c3a5f] [formerly 633a33dd21 [formerly 43802c3a5f] [formerly 47fc09a684 [formerly ea2d524767ea5eef74cda5fa5fbff886da1d3bc9]]]
Former-commit-id: 47fc09a684
Former-commit-id: 293af25a13 [formerly 239f37f467]
Former-commit-id: a7d8cfb651
2014-02-11 14:48:07 -05:00
Ben Steffensmeier
d69ac764db Issue #2765 Fix aliases for probability parameters.
Former-commit-id: 2952ae37a6 [formerly 43a8b80ef2] [formerly 2952ae37a6 [formerly 43a8b80ef2] [formerly 0bb18f2cd7 [formerly 11bbfb8275cfafb411d1d5d9732b021f0011712a]]]
Former-commit-id: 0bb18f2cd7
Former-commit-id: c0dbdb9906 [formerly eb9c4ef999]
Former-commit-id: 8a4c3686f8
2014-02-11 11:35:03 -06:00
Ben Steffensmeier
cf1d48f888 Issue #2672 Allow One extra null byte in RemoteRequestRouteWrapper.
Former-commit-id: 3bc210a1f1 [formerly 3d08979eee] [formerly 3bc210a1f1 [formerly 3d08979eee] [formerly 40bc9df420 [formerly 7463bf7c3efbdf8eb184f24bfc9c6a12c57d5006]]]
Former-commit-id: 40bc9df420
Former-commit-id: 01c4ce8e29 [formerly a0227d2c4e]
Former-commit-id: 38c9773f38
2014-02-10 17:39:32 -06:00
Nate Jensen
93a740106d Issue #2704 smarter thin client connectivity dialog and connection
checking

Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af

Former-commit-id: c28085118f [formerly 75ca70fba6] [formerly c28085118f [formerly 75ca70fba6] [formerly fd43d9e095 [formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]]]
Former-commit-id: fd43d9e095
Former-commit-id: c0256ac19e [formerly 2111989497]
Former-commit-id: 9e09da8bb6
2014-02-10 16:48:29 -06:00
Nate Jensen
382de81b9a Merge "Issue #2778 fix bug in JUtilHandler.py where size was None. Also made the registrations an OrderedDict for falling back so we can order how we fall back" into development
Former-commit-id: 9f2d49e31d [formerly 93c84e2f95] [formerly 9f2d49e31d [formerly 93c84e2f95] [formerly 06679bbd46 [formerly 30172e9189354a7be4581dfcf8c519dfdf7b8e8e]]]
Former-commit-id: 06679bbd46
Former-commit-id: 3de470ba73 [formerly 733c21051c]
Former-commit-id: 9f07a9431d
2014-02-10 11:26:10 -06:00
Matt Nash
5ad02eb0e3 Issue #2778 fix bug in JUtilHandler.py where size was None. Also made the registrations an OrderedDict for falling back so we can order how we fall back
Change-Id: I31120de5d206ddcade83e2c5455742deb1d6598a

Former-commit-id: dccb819738 [formerly 4252e58992] [formerly dccb819738 [formerly 4252e58992] [formerly 1ecc4541cf [formerly a1ca74f1b2ad0176ab38e4a41bb7df62e06cc0c1]]]
Former-commit-id: 1ecc4541cf
Former-commit-id: 5ce022cc1e [formerly f300282a22]
Former-commit-id: 053615e387
2014-02-10 08:40:25 -06:00
Brad Gonzales
a8256a5202 Issue #2636 Changed EdexBandwidthManager startup scheduling to use the
in-memory bandwidth manager to setup initial scheduling because it
is much faster.

Amend: updated log statement.
       fix for rescheduling of already scheduled BandwidthAllocations.

Change-Id: I5c6d6543bce8222cb746fde2951caf6439db5fa3

Former-commit-id: 9529c1d191 [formerly 9c50fb29fd] [formerly 9529c1d191 [formerly 9c50fb29fd] [formerly 704e466f28 [formerly f1a4a7b24290b6e85380668563793ac529fc5b31]]]
Former-commit-id: 704e466f28
Former-commit-id: b59278f73f [formerly 0b211e8036]
Former-commit-id: 104625b66d
2014-02-07 09:35:36 -06:00
Ben Steffensmeier
a242847062 Issue #2672 Handle envelopes in data access requests of points and lightning.
Change-Id: Id9a56e9f8027a2f489561c241e2f34dd92dce400

Former-commit-id: cd772d8961 [formerly 25ad0e327c] [formerly cd772d8961 [formerly 25ad0e327c] [formerly ec8514000f [formerly efe32c8302834b1c53a5f65850aff8f12437d3bb]]]
Former-commit-id: ec8514000f
Former-commit-id: b28f945bc1 [formerly 19cb907ac8]
Former-commit-id: 32c8f9f149
2014-02-06 14:04:14 -06:00
Ben Steffensmeier
b6a5148b42 Issue #2762 Fix Satellite Data Access.
Former-commit-id: a26a150a69 [formerly 2166b5b696] [formerly a26a150a69 [formerly 2166b5b696] [formerly ed2c1a0329 [formerly 4016e9366e8917225777b079da4b94dd1e6fde4a]]]
Former-commit-id: ed2c1a0329
Former-commit-id: 270433f5f3 [formerly e7662de8db]
Former-commit-id: ad709c9692
2014-02-06 13:53:44 -06:00
Ben Steffensmeier
18f05123ca Issue #2672 Fix serialization of jts envelopes.
Former-commit-id: fc783a8e6e [formerly 97eef922ef] [formerly fc783a8e6e [formerly 97eef922ef] [formerly a068650e43 [formerly 42b0e215a3e2bfe4ca8d789f025c49d8f35f6a6c]]]
Former-commit-id: a068650e43
Former-commit-id: 1cee24ce50 [formerly 43df5b25d9]
Former-commit-id: 1be7b9c7dc
2014-02-06 11:27:07 -06:00
Mike Duff
c9f53e2346 Issue #2636 - Fix for ncf spring config
Former-commit-id: 3707a4eabd [formerly 3f7defe563] [formerly 3707a4eabd [formerly 3f7defe563] [formerly e84ae26421 [formerly 4308e8a45d61e9d6a67b6036e98ff1b8886d86f6]]]
Former-commit-id: e84ae26421
Former-commit-id: 9ec273fdcc [formerly 6210a6aa18]
Former-commit-id: af8013baa7
2014-02-06 09:29:20 -06:00
Richard Peter
8471e5dd46 Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1
Former-commit-id: 82fc0a2ed3 [formerly 64f0cabaef] [formerly 82fc0a2ed3 [formerly 64f0cabaef] [formerly 36d3d21b57 [formerly daacb19de029a15f94338c84a85116d0435f79be]]]
Former-commit-id: 36d3d21b57
Former-commit-id: c3c1205848 [formerly c965993d17]
Former-commit-id: 15c2f761be
2014-02-05 18:20:36 -06:00
Mike Duff
377beb33a8 Issue #2677 - Don't do overlap checks when updating subs to deactivated.
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd

Former-commit-id: bafe19bbd5 [formerly 101c08818d] [formerly bafe19bbd5 [formerly 101c08818d] [formerly 6b01c2957f [formerly 2e406f02b0abbdeee0f553df430f5a58977d9af2]]]
Former-commit-id: 6b01c2957f
Former-commit-id: 9edf591218 [formerly 6a2f75e8d5]
Former-commit-id: bb43ec00b1
2014-02-05 16:08:01 -06:00
Ben Steffensmeier
1619859812 Issue #2672 Handle envelopes in data access requests of gridded types.
Change-Id: I4a58e6489e2173457d50e6f3c06e2e8fffdb678c

Former-commit-id: b84bf8c891 [formerly 9c439866d5] [formerly b84bf8c891 [formerly 9c439866d5] [formerly dc5b5526a3 [formerly f634fe40e6fa7a8a3af575e79cb3d996761db983]]]
Former-commit-id: dc5b5526a3
Former-commit-id: 5b7cf3caec [formerly 02a0874646]
Former-commit-id: 70cbd6c61d
2014-02-05 15:57:08 -06:00
Dave Hladky
59590fdf36 Issue #2686 Refactor of retrieval
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558

Former-commit-id: 7fb7e10cda [formerly 6172c83afc] [formerly 7fb7e10cda [formerly 6172c83afc] [formerly 39f97723d6 [formerly 0b85e00cecdca6c5dcb6deee138f1a002515ac3c]]]
Former-commit-id: 39f97723d6
Former-commit-id: 39f5579103 [formerly 2b998409f5]
Former-commit-id: 8e2eb4d255
2014-02-05 14:49:26 -06:00
Richard Peter
1aaeaf0037 Merge "Issue #2636 - Scheduling refactor. Single scheduling method now. Review comments" into omaha_14.2.1
Former-commit-id: 21b0a87d78 [formerly 8f844bc9ce] [formerly 21b0a87d78 [formerly 8f844bc9ce] [formerly e5af004993 [formerly a2536c180f68e5ea970e3406e3ef1f899650f3e2]]]
Former-commit-id: e5af004993
Former-commit-id: d3f13fc4c7 [formerly 4309c55a5f]
Former-commit-id: 1b8aacc92f
2014-02-04 18:12:48 -06:00
Brian.Dyke
a9af4960f0 Issue #224
Former-commit-id: ed476a583f [formerly 3f86a80d7e] [formerly ed476a583f [formerly 3f86a80d7e] [formerly dad6f2896b [formerly 043faa447b4fc15a996dfe6108093bed5f1b6497]]]
Former-commit-id: dad6f2896b
Former-commit-id: 17e3464377 [formerly 610cf76a29]
Former-commit-id: 6e57eae922
2014-02-04 17:05:12 -05:00
Brian.Dyke
cc4a735533 Issue #179
Former-commit-id: 6b3ebc4fef [formerly a0626cdc00] [formerly 6b3ebc4fef [formerly a0626cdc00] [formerly b23c6f59f7 [formerly d8f5c94fdc7a3332293e24c5e59d1d7177a5fcd9]]]
Former-commit-id: b23c6f59f7
Former-commit-id: 2955d5c9f0 [formerly 6d58d8c016]
Former-commit-id: 5ac5774552
2014-02-04 16:53:34 -05:00
Brian.Dyke
d099529ef7 Issue #131
Former-commit-id: dea5f087d3 [formerly bd5db64b5b] [formerly dea5f087d3 [formerly bd5db64b5b] [formerly 35b25ee2a9 [formerly 4167f33801ee2450502231438955e72c4428fbcc]]]
Former-commit-id: 35b25ee2a9
Former-commit-id: 6882fc8d52 [formerly 4701088670]
Former-commit-id: 41b079e7fe
2014-02-04 16:36:11 -05:00
Brian.Dyke
904ffbd83e Issue #88
Former-commit-id: d56bdce6ff [formerly 643ef1a1a6] [formerly d56bdce6ff [formerly 643ef1a1a6] [formerly edccef5569 [formerly 66a1b2ba9933754b0d6d0324108268563e6381bc]]]
Former-commit-id: edccef5569
Former-commit-id: cdb408daf8 [formerly a5606c86c7]
Former-commit-id: 83ebe8826f
2014-02-04 16:34:40 -05:00
Mike Duff
bd52f67e0c Issue #2636 - Scheduling refactor. Single scheduling method now.
Review comments

Change-Id: I4d1e7c171504a8a6f97d4660bf165857dd6e7e58

Former-commit-id: 2ca26aaa39 [formerly eee642ac9b] [formerly 2ca26aaa39 [formerly eee642ac9b] [formerly eb46191ba9 [formerly fc9ed661c3fe3ca75d30d8df414b5d1cd5725613]]]
Former-commit-id: eb46191ba9
Former-commit-id: 38aeb23274 [formerly 684390e599]
Former-commit-id: e8dea0d0dc
2014-02-04 14:01:29 -06:00
Richard Peter
a7b90d781a Merge "Issue #2769 Removed aggressive Hibernate session flushes" into omaha_14.2.1
Former-commit-id: fe3963680d [formerly 844f05e1ef] [formerly fe3963680d [formerly 844f05e1ef] [formerly fb8d982ede [formerly b2edf70f6d9404ed4963ee874c3e03d13bf49303]]]
Former-commit-id: fb8d982ede
Former-commit-id: 99a7c7afd7 [formerly 4c361f2cff]
Former-commit-id: 05a1e52357
2014-02-04 12:22:19 -06:00
Brian.Dyke
b8f7317b9d 14.1.1-17 baseline
Former-commit-id: f3d34b0c38 [formerly 180d1356cd] [formerly f3d34b0c38 [formerly 180d1356cd] [formerly 23280af290 [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]]
Former-commit-id: 23280af290
Former-commit-id: f1cc9d6ee2 [formerly 947ec5fd96]
Former-commit-id: 948fffa361
2014-02-04 12:33:46 -05:00
Benjamin Phillippe
d4adefdad8 Issue #2769 Removed aggressive Hibernate session flushes
Change-Id: Idaeb3ecf0a62cc586ed34525260034cd89e96216

Former-commit-id: 3f4b92fffb [formerly 1691c5a3ff] [formerly 3f4b92fffb [formerly 1691c5a3ff] [formerly fc589ed84d [formerly 0440395a596d13bf8b4f1dda4857c185c6c8afa5]]]
Former-commit-id: fc589ed84d
Former-commit-id: 20d26dc5a0 [formerly cdaa7e32b4]
Former-commit-id: 01def4be4a
2014-02-04 10:24:11 -06:00
Mike Duff
a33c96d8fc Issue #2745 - Don't display fulfilled or cancelled allocations
Former-commit-id: 4d529f5051 [formerly f81772f4be] [formerly 4d529f5051 [formerly f81772f4be] [formerly c9b98868d2 [formerly 7b7f294622e886d7457d7abe0451d3e819568677]]]
Former-commit-id: c9b98868d2
Former-commit-id: 8b3b5a688f [formerly 4a07f6fb4c]
Former-commit-id: 1065c56bde
2014-02-03 16:57:03 -06:00
Steve Harris
e6cab2a902 Merge branch 'omaha_14.2.1' into development
Conflicts:
	ncep/gov.noaa.nws.ncep.viz.ui.perspectives/plugin.xml

Former-commit-id: ae2b849157 [formerly 7a156e297a] [formerly ae2b849157 [formerly 7a156e297a] [formerly 7b59bd41eb [formerly debbd62a40cf8d27b1990d1b06f273d09dd9a981]]]
Former-commit-id: 7b59bd41eb
Former-commit-id: 4a379aa6e5 [formerly aa9b488963]
Former-commit-id: b9af02c0b3
2014-02-03 10:29:16 -06:00
Steve Harris
08700a77b1 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 131af8538e [formerly b2032880ac] [formerly 131af8538e [formerly b2032880ac] [formerly eb9d4319dc [formerly 9133aeccd450b0e241953c588192c2ee33fcbe8e]]]
Former-commit-id: eb9d4319dc
Former-commit-id: 6883c64744 [formerly 33aea09906]
Former-commit-id: d8989145ac
2014-02-03 10:26:11 -06:00
Everett Kladstrup
3c30f65980 Issue #2725 deriv param to common stage 1
* Removing viz dependencys from derivparam
** Move LevelUtilities to common
** Use spring instead of eclipse plugin extentions
   to configure derived parameter function types
** Use RequestRouter instead of ThriftClient so
   we can use IServerRequest objects in both CAVE
   and EDEX

The next stage will be to clean up exceptions in
derived parameters to stop using VizException and
VizCommunicationException.


Former-commit-id: 90df04614d [formerly bd50a38d87] [formerly 90df04614d [formerly bd50a38d87] [formerly 80ad25754b [formerly 604ae156f8b235e2e1736863b419547289403240]]]
Former-commit-id: 80ad25754b
Former-commit-id: 40b796f59b [formerly 415ccd78fb]
Former-commit-id: 57f9230654
2014-02-03 09:02:58 -06:00
Brian.Dyke
a540be3064 Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: 89b824b846 [formerly 4e7b1b207f] [formerly 89b824b846 [formerly 4e7b1b207f] [formerly 40ce5ccc2a [formerly 0409f7045a797c8c051a353d69de1991b8c8b681]]]
Former-commit-id: 40ce5ccc2a
Former-commit-id: 3fd2ef82ab [formerly dd183bc0e9]
Former-commit-id: df55ab5503
2014-01-31 08:28:09 -05:00
Greg Armendariz
af0af0920b Merge "Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN events while in there" into omaha_14.2.1
Former-commit-id: 7fbfe85478 [formerly ed0c724860] [formerly 7fbfe85478 [formerly ed0c724860] [formerly 5ad9cca7a3 [formerly 4df9504e742c2807676521b10e56797fb3a24a68]]]
Former-commit-id: 5ad9cca7a3
Former-commit-id: b4d9ec0e46 [formerly 66e79f459e]
Former-commit-id: 677e6ac584
2014-01-30 13:04:40 -06:00
Nate Jensen
cfb4bdbb21 Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN
events while in there

Change-Id: I678035f35aef0153fdc92b935bad4372d77d3619

Former-commit-id: c18e66cc45 [formerly 327c588c9e] [formerly c18e66cc45 [formerly 327c588c9e] [formerly 906c679b4e [formerly 68de7dd0f4e5728cb077dad541ef9369627fced4]]]
Former-commit-id: 906c679b4e
Former-commit-id: af0ac40f47 [formerly 7bd1d802be]
Former-commit-id: ed91c1d6f5
2014-01-30 12:02:42 -06:00
Ben Steffensmeier
a00d385f2e Issue #2537 Fix modelsounding registration.
Former-commit-id: 12b989a34b [formerly 819369747e] [formerly 12b989a34b [formerly 819369747e] [formerly 1db0291792 [formerly e4e476afc2063211523840eaa6f845a4c2264774]]]
Former-commit-id: 1db0291792
Former-commit-id: 17ed6c9664 [formerly 501aec2537]
Former-commit-id: d06eb22524
2014-01-29 15:36:05 -06:00
Ron Anderson
7e541f2f77 Merge "Issue #2719 Add NHA domain to serverConfig.py" into omaha_14.2.1
Former-commit-id: 81f9709ae7 [formerly fb262fdad2] [formerly 81f9709ae7 [formerly fb262fdad2] [formerly 7c06f0b011 [formerly 2c3e2b9bf8bf01065d79221febe9e95a8efaa46e]]]
Former-commit-id: 7c06f0b011
Former-commit-id: 25123bdeb0 [formerly 64f55c6b02]
Former-commit-id: d2d7920575
2014-01-29 14:16:31 -06:00
Ron Anderson
2086f03c28 Issue #2719 Add NHA domain to serverConfig.py
Change-Id: Ia7c5026ab5b8ae4c9c00adaf90b01d9fa527a044

Former-commit-id: ea12cecc04 [formerly ce28c6c47f] [formerly ea12cecc04 [formerly ce28c6c47f] [formerly 0f6e082769 [formerly 2c8d067a3a4c4848bc2eb313c4e901507844074d]]]
Former-commit-id: 0f6e082769
Former-commit-id: 09335f5372 [formerly 5427d15150]
Former-commit-id: 280434a03f
2014-01-29 13:55:54 -06:00
David Gillingham
14326b8c8d Issue #2170: Fix SPCWatchSrv and TPCWatchSrv spring routes, add exception handling for WCLWatchSrv route.
Former-commit-id: fc25bbe1e9 [formerly 5edfbaa4a5] [formerly fc25bbe1e9 [formerly 5edfbaa4a5] [formerly c802315ddc [formerly 3dfffb5f49a84a6ed82481d08c809e1217750f70]]]
Former-commit-id: c802315ddc
Former-commit-id: 04d6bc5a42 [formerly 17d38b4974]
Former-commit-id: 38333b45a7
2014-01-29 11:56:05 -06:00
Steve Harris
e3d1abe909 Merge branch 'omaha_14.2.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.application/src/com/raytheon/uf/viz/application/VizApplication.java

Former-commit-id: 14ba3b29f4 [formerly 1738185503] [formerly 14ba3b29f4 [formerly 1738185503] [formerly 1aea63a1f6 [formerly d1fb8bcf1780b94bf23ce60dc4a6e0a10b37fe45]]]
Former-commit-id: 1aea63a1f6
Former-commit-id: d9cd003a5a [formerly 1fd5b2255f]
Former-commit-id: ec69a2c4f7
2014-01-29 09:41:57 -06:00
Ron Anderson
4512aadb1c Merge "Issue #2504 Fix ingestAT" into omaha_14.2.1
Former-commit-id: 6d33a83771 [formerly b7c10ddebf] [formerly 6d33a83771 [formerly b7c10ddebf] [formerly 20259f3554 [formerly 8040e4cad015d5725ed3b08bc9ae5e4d97b21749]]]
Former-commit-id: 20259f3554
Former-commit-id: 5f9706019e [formerly 604a4363a3]
Former-commit-id: 3a55c53d5b
2014-01-29 08:39:41 -06:00
Mike Duff
3495a67c27 Issue #2636 - Changed subscription code to use gmt calendar.
Former-commit-id: 4440c27ff6 [formerly 6e01cdb78e] [formerly 4440c27ff6 [formerly 6e01cdb78e] [formerly 1caacacfe3 [formerly 3e75bd3e55517bca7c85213307ed67973c2f145e]]]
Former-commit-id: 1caacacfe3
Former-commit-id: a76507e04f [formerly f4da152d87]
Former-commit-id: 1f4cc8681d
2014-01-28 11:09:33 -06:00
Ron Anderson
b6624cf7ca Issue #2504 Fix ingestAT
Change-Id: Ic77b0c5b82face45578272edca1dd613dd9509b8

Former-commit-id: a78d1fcd6b [formerly bb2ef86d14] [formerly a78d1fcd6b [formerly bb2ef86d14] [formerly 045ebfe967 [formerly ccf63372764f767af99d93b4d0299f9b8d066ee6]]]
Former-commit-id: 045ebfe967
Former-commit-id: cca9be6e65 [formerly 89246e17c5]
Former-commit-id: 9dfa819625
2014-01-27 18:16:46 -06:00
Stephen Gilbert
f7c1bee352 Merge "VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1" into ncep_14.2.1
Former-commit-id: 53fa8822e0 [formerly 6785474b17] [formerly 53fa8822e0 [formerly 6785474b17] [formerly b64adbed81 [formerly 57ce64e6119d2bf540da80c1161b88b04474d53c]]]
Former-commit-id: b64adbed81
Former-commit-id: 511123b38c [formerly d947a0e7c1]
Former-commit-id: 4cd6847849
2014-01-27 14:20:47 -05:00
Richard Peter
b9f6b88091 Merge "Issue #2711 Get All levels from the database for derived parameters." into development
Former-commit-id: 766af8b281 [formerly 90dd7474b3] [formerly 766af8b281 [formerly 90dd7474b3] [formerly 5c1de78c24 [formerly b238a853283cc1b71ce290b233db5f174e486c9f]]]
Former-commit-id: 5c1de78c24
Former-commit-id: 953925d24b [formerly e9bc96c37e]
Former-commit-id: bc9789fee5
2014-01-27 11:36:55 -06:00
Ben Steffensmeier
88f17f6f92 Issue #2711 Get All levels from the database for derived parameters.
Former-commit-id: fdb67f9979 [formerly 08d277fe62] [formerly fdb67f9979 [formerly 08d277fe62] [formerly 3ca92176ac [formerly 0b36f91188c458532eb26d8b4a01e7f8954eba5a]]]
Former-commit-id: 3ca92176ac
Former-commit-id: c42af67f51 [formerly bedec49852]
Former-commit-id: 4e0013ae24
2014-01-27 11:12:08 -06:00
Brian Clements
ff1882e80a Issue #2701 removed local groups from collaboration
added shared groups to represent groups managed by server
local group actions changed to modify roster groups
code cleanup on contacts manager including removing unneeded roster manager
update script to clean up localization files
removed ui option to create an empty group


Former-commit-id: b86ad8ca6f [formerly f615f2226f] [formerly b86ad8ca6f [formerly f615f2226f] [formerly 26ac549096 [formerly 06a9db4836fa2753a913e2314a8c003380416eac]]]
Former-commit-id: 26ac549096
Former-commit-id: cfe945d76b [formerly 8944860cbb]
Former-commit-id: dd9b3ca640
2014-01-27 10:14:10 -06:00
Brad Gonzales
7707be3dcd Issue #2709 updated devRegistry.sh and added retrieval monolithic for running shareds in devRegistry.
Amend: update from peer review.

Change-Id: I1986de99319fdecd21a94579c499266b048d382a

Former-commit-id: afbaf72617 [formerly e94023097e] [formerly afbaf72617 [formerly e94023097e] [formerly 02f9fd20dc [formerly 4057294c4f777ffb4ea3523bbaea7ed1a084cbd6]]]
Former-commit-id: 02f9fd20dc
Former-commit-id: 71a32928d9 [formerly a40afbe8ac]
Former-commit-id: f7c3c8c83d
2014-01-26 20:31:38 -06:00
Lee Venable
4cbf1f4ff4 Merge "Issue #2741 Fixed nullpointers in Retrieval and BWM Change-Id: I2530b194fa7f1b4fb2a6af4211e82b29b9b0c576" into omaha_14.2.1
Former-commit-id: e3e3c4feef [formerly a49cfc6a74] [formerly e3e3c4feef [formerly a49cfc6a74] [formerly d9d985eee4 [formerly 9e39a2d080e9727965a4e840847d9940af2ec3ad]]]
Former-commit-id: d9d985eee4
Former-commit-id: f7dff455d2 [formerly f387778dce]
Former-commit-id: f64efd9712
2014-01-26 19:17:04 -06:00