Commit graph

1110 commits

Author SHA1 Message Date
Ron Anderson
c0f2c84b19 Issue #1787 Fixed to support changes to D2D grid location
Change-Id: I9ba8a45cf5b4f1ada6eaf1390f922bc5560d6e5c

Former-commit-id: f0e2bf8755 [formerly 4ea01a29ce] [formerly c233ce042d] [formerly f0e2bf8755 [formerly 4ea01a29ce] [formerly c233ce042d] [formerly 4cd87f2726 [formerly c233ce042d [formerly 5a15d9add4f47cb2016bbd453008039cef8f765f]]]]
Former-commit-id: 4cd87f2726
Former-commit-id: f10107fef4 [formerly 24a6a3590f] [formerly c8230f228e91a9f3155cde9baf0651765c522e16 [formerly e9f674a575]]
Former-commit-id: f8d56d18af251880f893a19b401fdc01b452c187 [formerly 89a2d99bfe]
Former-commit-id: 4dd37ae7cd
2013-04-15 18:02:47 -05:00
Dave Hladky
99d0c3901c Issue #1890 moved date keys to references in FFMPRecord instead of hard object in FFMPBasin
Change-Id: I840e0805422686856744f0d39dda0aeac4755bb8

Former-commit-id: bb6814beef [formerly c52445652a] [formerly 60fa768195] [formerly bb6814beef [formerly c52445652a] [formerly 60fa768195] [formerly 978e68d893 [formerly 60fa768195 [formerly 4c1e41a6a77ea89f2a0c0253671b8d6cca071c04]]]]
Former-commit-id: 978e68d893
Former-commit-id: 1ca77b427f [formerly d0ec4f0d87] [formerly c72d0a748e1272940a038261a3b8315e8fd1eeee [formerly 5789936212]]
Former-commit-id: a2225196ae722fa9348d20acb31f2d406f2af39b [formerly 0f7843f0b7]
Former-commit-id: 14a08d6f66
2013-04-15 17:58:06 -05:00
Lee Venable
99bf297190 Merge "Issue #1902 - FFMP permormance/cleanup peer review comments" into omaha_13.4.1
Former-commit-id: c23b6d31d5 [formerly 9ae56e2172] [formerly 8723d88a19] [formerly c23b6d31d5 [formerly 9ae56e2172] [formerly 8723d88a19] [formerly 8c8709f4a6 [formerly 8723d88a19 [formerly 042819679ba8e0d22695b41059772da841619f29]]]]
Former-commit-id: 8c8709f4a6
Former-commit-id: 953d3f79fb [formerly b18fa4f6bf] [formerly 3ebd30bd68f66548fee71c2096f5598c7cdba3aa [formerly 1674a59ed3]]
Former-commit-id: b694b850da12576a75b20bb91bfeb2f285ef290a [formerly ec3f0c0a11]
Former-commit-id: 783df0394c
2013-04-15 15:33:53 -05:00
Nate Jensen
2fa9a1cc65 Merge "Issue #1870 add package-info.java so that the empty src directory gets pushed to git" into development
Former-commit-id: 7e6cbbeca8 [formerly 56c1fe7422] [formerly 0cbf561f7c] [formerly 7e6cbbeca8 [formerly 56c1fe7422] [formerly 0cbf561f7c] [formerly d411aad285 [formerly 0cbf561f7c [formerly 3d866c91c40a5addb5268c274f2cf25eef8b5fc1]]]]
Former-commit-id: d411aad285
Former-commit-id: 959a8867e9 [formerly d785d3f1c2] [formerly 13c131b4ba733ec8bfe111d53be343dd584dd76c [formerly 9d0e3fd0c2]]
Former-commit-id: 8612484a7e2a30162bc90a91e8c23595f6b0fdca [formerly 2eaf49612c]
Former-commit-id: f8c3cb4589
2013-04-15 14:57:03 -05:00
Matt Nash
35f5d4167e Issue #1870 add package-info.java so that the empty src directory gets pushed to git
Change-Id: I75d97d6b54de65507288c1b43aaa02b143218840

Former-commit-id: 24711d9f2c [formerly 7ffb45758d] [formerly 0d12fb16bc] [formerly 24711d9f2c [formerly 7ffb45758d] [formerly 0d12fb16bc] [formerly 4b896002ac [formerly 0d12fb16bc [formerly df00846cfe22e318eafe40eaaa08a13b20fd5c58]]]]
Former-commit-id: 4b896002ac
Former-commit-id: c3b78dcb45 [formerly 317cbf0950] [formerly 3171c53715c04eee22a513fc63775f14cec341d2 [formerly 87af6d2809]]
Former-commit-id: 07f95159ba72d1a2635b6c0d391a0b4e90166b2a [formerly a2e421048c]
Former-commit-id: a8358a4b40
2013-04-15 14:53:07 -05:00
Mike Duff
c53f202b19 Issue #1902 - FFMP permormance/cleanup
peer review comments

Change-Id: Id0c238906a1189c9c88e3dc99aa0a60cbfa00a15

Former-commit-id: dc8e37c0df [formerly 8271eaf328] [formerly 020713663a] [formerly dc8e37c0df [formerly 8271eaf328] [formerly 020713663a] [formerly 85f1aba297 [formerly 020713663a [formerly 15b28d081af503387ed1c350f4ec23258c41d68f]]]]
Former-commit-id: 85f1aba297
Former-commit-id: 41b00b0d6d [formerly 7a1809afca] [formerly 3c48d99b3e2289bad30a4264bbe35a37469181cf [formerly f61bae1c3e]]
Former-commit-id: 4b99fb61085242237b0321d02bcd5fb3d32fea55 [formerly 812599d8db]
Former-commit-id: feb9fc93ef
2013-04-15 09:40:07 -05:00
Ron Anderson
f96fdd67ef Merge "Issue #1845: Fix gfeNotify with java qpid broker" into omaha_13.4.1
Former-commit-id: e129ae4a36 [formerly 4e62fbdd54] [formerly df06966a09] [formerly e129ae4a36 [formerly 4e62fbdd54] [formerly df06966a09] [formerly 428fdebd9e [formerly df06966a09 [formerly f23561f863b623b230b19ef2075560507fc61fb6]]]]
Former-commit-id: 428fdebd9e
Former-commit-id: c831fc3292 [formerly b60c6b19e6] [formerly 7037a1c300eb4f108baf28b024ae5151c842fd6c [formerly c4d754d75e]]
Former-commit-id: 5aadb48146ad8988f94e7065e62dd3b1f0cc181f [formerly e01f6a0f7f]
Former-commit-id: dca0eeb302
2013-04-15 08:27:42 -05:00
Nate Jensen
4ea7202999 Merge "Issue #1735 Speed ups for AcarsSoundingRecords and conversion to ThriftClient in MonitorDataUtil." into omaha_13.4.1
Former-commit-id: d3517fbb70 [formerly ea2c0e6c40] [formerly b24ccfd7a3] [formerly d3517fbb70 [formerly ea2c0e6c40] [formerly b24ccfd7a3] [formerly a422709ab6 [formerly b24ccfd7a3 [formerly bc12d9c818b72ae16c485a33719817bd15301bca]]]]
Former-commit-id: a422709ab6
Former-commit-id: 0e59bce548 [formerly bee4f5fafd] [formerly e364f2da4f532bb4457a194e508a8bcd3c974e67 [formerly 32ea01b8b8]]
Former-commit-id: cd1b8414b4907b1d08d2be7d5ff13465b1732892 [formerly e2f072f2d5]
Former-commit-id: f1c3f25368
2013-04-12 12:39:12 -05:00
Richard Peter
f9e73b5287 Issue #1845: Fix gfeNotify with java qpid broker
Change-Id: I792b4598a296dcd7a8bafbd89c184dc709fdc193

Former-commit-id: efe0dce3ed [formerly 4e3e044281] [formerly 025600f4cb] [formerly efe0dce3ed [formerly 4e3e044281] [formerly 025600f4cb] [formerly a6ffc663a9 [formerly 025600f4cb [formerly 9f3806e9579cef66d0a40a290d9d36a089f2b3d6]]]]
Former-commit-id: a6ffc663a9
Former-commit-id: 1900f948ea [formerly c613cfb4da] [formerly 39f79af483b4fc0c6b07a413de9dad0dd3860164 [formerly 207b4cafcc]]
Former-commit-id: 73092e863762bde5401473994af6d738c9656237 [formerly 153e552f8a]
Former-commit-id: 2110908015
2013-04-12 12:04:54 -05:00
Benjamin Phillippe
3733212782 Issue #1802 Implemented ebxml registry replication
Change-Id: I9ddcb2f3a8410e5bae8f03b4c881625ecef8a531

Former-commit-id: fa6cdf46db [formerly e3f3483b51] [formerly 120906de78] [formerly fa6cdf46db [formerly e3f3483b51] [formerly 120906de78] [formerly ec69cdeb44 [formerly 120906de78 [formerly 078545ff0fdbd591ebf69f22eb2e8400386c2bdf]]]]
Former-commit-id: ec69cdeb44
Former-commit-id: 0a930ce83c [formerly e5fbf006dd] [formerly 8dba2ff501e80c05042800d7e6c73e3267e77ee2 [formerly c0099a8a39]]
Former-commit-id: 95c16add15912c7c114c1119ff48e3bd9099e7ee [formerly d9b5511b8b]
Former-commit-id: 1967c632e5
2013-04-12 11:27:45 -05:00
Roger Ferrel
1d036eb29c Issue #1735 Speed ups for AcarsSoundingRecords and conversion to ThriftClient in MonitorDataUtil.
Change-Id: Iaa88a15c0406bf5b0c9ffeb5af7f31701be226a9

Former-commit-id: 04ab641171 [formerly 1258e12e11] [formerly 842852d975] [formerly 04ab641171 [formerly 1258e12e11] [formerly 842852d975] [formerly 4c15be46a0 [formerly 842852d975 [formerly 7cf9c217010a260281480eccdcc4e0b8d83fcd1f]]]]
Former-commit-id: 4c15be46a0
Former-commit-id: a8534ec26f [formerly 0b7d85a43f] [formerly 7701c00608738698fe5760f22807ef2cffec9b97 [formerly e3bacfb9f0]]
Former-commit-id: c26b591296e8b58697fbaeae88fdab31fbcd248d [formerly 94c372088d]
Former-commit-id: 5a6926dfa3
2013-04-12 11:10:13 -05:00
Bryan Kowal
646d4f067b Issue #1901 - EDEX will no longer automatically be killed during shutdown
Former-commit-id: 45b8575578 [formerly fabebb7adf] [formerly 36fa6f932b] [formerly 45b8575578 [formerly fabebb7adf] [formerly 36fa6f932b] [formerly 81423bdca1 [formerly 36fa6f932b [formerly 5b6452684b4a64620586e265f54dbcfa15c974ff]]]]
Former-commit-id: 81423bdca1
Former-commit-id: 90a8ca12d2 [formerly d2cb482ead] [formerly 609c94b5216a83b09b52f79feb470218cac58979 [formerly 694e7fe9ee]]
Former-commit-id: 8c1a7fda765eab54cc27b183d9a9717bfa14e11c [formerly 28570210c6]
Former-commit-id: 272441938c
2013-04-12 10:36:15 -05:00
David Gillingham
e7e405a2b8 Issue #1898: Modify service backup export_configuration script to also include site's map bundles.
Former-commit-id: a3003e5e07 [formerly 967ec40df6] [formerly d5c8ecc6d3] [formerly a3003e5e07 [formerly 967ec40df6] [formerly d5c8ecc6d3] [formerly 7303425900 [formerly d5c8ecc6d3 [formerly d197bc7fef0ca97f533d5270625b5e696ab29dca]]]]
Former-commit-id: 7303425900
Former-commit-id: 48f984f712 [formerly d9035f421c] [formerly 39ff6f5c3e931b1e24bfdda8798342c2b31f95c8 [formerly b6201bba2f]]
Former-commit-id: 6e7ea9ae22125510690ad51699dbbc6463ee34ef [formerly 30493697f8]
Former-commit-id: 73ea61a34d
2013-04-12 09:50:47 -05:00
Matt Nash
9044f422ba Issue #1871 convert parameters to Strings and make sure to return them
Change-Id: I18063a0be05646b98404eea2225fc7a0f5d95ea7

Former-commit-id: 6f12e80c0d [formerly 64323fc0af] [formerly cd77308fac] [formerly 6f12e80c0d [formerly 64323fc0af] [formerly cd77308fac] [formerly 6c488cee05 [formerly cd77308fac [formerly 429b21c5f258fa9cd267933506bfe7091bb0e30b]]]]
Former-commit-id: 6c488cee05
Former-commit-id: 6e4cdda323 [formerly 4ee6085bda] [formerly b7dde24ffa640c3ec2a075a60bbac138bc9b7837 [formerly 7dd72ab7d5]]
Former-commit-id: bb7a2e01e84d6a44c089c22831f81e386f072be2 [formerly 6969b0c0ae]
Former-commit-id: 63a13ef503
2013-04-12 09:31:23 -05:00
Matt Nash
eb17cb0e94 Issue #1871 add default values for times so they don't need to be sent in from
Python, move getLatLonCoords()

Change-Id: Ic37728e269a9899adaf8be1c6d86cd644f417ba1

Former-commit-id: 01e9ab8a06 [formerly 2ab1cf8abb] [formerly 3af61d7117] [formerly 01e9ab8a06 [formerly 2ab1cf8abb] [formerly 3af61d7117] [formerly b44ee44664 [formerly 3af61d7117 [formerly 01971b490beee0cc87df4ed478c3a66bbad2158f]]]]
Former-commit-id: b44ee44664
Former-commit-id: 6a755f6a4b [formerly e6fc7942b8] [formerly 2a5d354ea6b4a6308cc09c3d485c9d2ea3778f71 [formerly c95e825d35]]
Former-commit-id: 8b3973aa378e7fd3ef3866d756662f36aa72b401 [formerly 7b25f73a9a]
Former-commit-id: dc0f234f02
2013-04-12 09:31:16 -05:00
Matt Nash
4de612db14 Issue #1871 make Java data access class better match Python version
Change-Id: Ic3ab7e771add58a693420a16a349e8208852a051

Former-commit-id: 9ed1c330a6 [formerly baafdafed7] [formerly 68c84fd8cc] [formerly 9ed1c330a6 [formerly baafdafed7] [formerly 68c84fd8cc] [formerly 4ac6480f52 [formerly 68c84fd8cc [formerly 21a59e4f9ab0e5a870b764259a1a0fc102f3b86f]]]]
Former-commit-id: 4ac6480f52
Former-commit-id: eccbf5b9aa [formerly 705be14b64] [formerly 1f8e933ae077261e7dc5b72f7658f41f6a5c2ec0 [formerly 7ffd8efcf2]]
Former-commit-id: b35c0c7badac7ea42a21c3abe131663d37ff3729 [formerly af190ad278]
Former-commit-id: 7f52894c51
2013-04-12 09:31:07 -05:00
Nate Jensen
2194f0341f Merge "Issue #1870 implement PathManager interface in Python to allow Python code to get files" into development
Former-commit-id: 304be5221b [formerly 03fac8cb06] [formerly 36ad161721] [formerly 304be5221b [formerly 03fac8cb06] [formerly 36ad161721] [formerly 8561b201d5 [formerly 36ad161721 [formerly f4c7a9294f6218b40e582ba5e5dc8faacf52436e]]]]
Former-commit-id: 8561b201d5
Former-commit-id: 6adb90b87f [formerly 12d4837e78] [formerly 8cdb4eceeef8bfd82310e77ac754c36c3a8c9e20 [formerly 826e64a990]]
Former-commit-id: 62adc7e0cacffa942ec26dadd9b3c228ff2e7383 [formerly 7c22745ac0]
Former-commit-id: 6a16f63002
2013-04-12 09:30:38 -05:00
Matt Nash
0985877ac1 Issue #1870 implement PathManager interface in Python to allow Python code to
get files

Change-Id: I0192c996533b1539194aaeba0213074bef8a4717

Former-commit-id: 054c9afeed [formerly 68892951c5] [formerly bf01f50e17] [formerly 054c9afeed [formerly 68892951c5] [formerly bf01f50e17] [formerly 4b23ec7c0a [formerly bf01f50e17 [formerly e3df8efa51ad95c952318b59edca702157a59856]]]]
Former-commit-id: 4b23ec7c0a
Former-commit-id: 6f32d989c4 [formerly 123351e82b] [formerly 593118c2fd517ea4ccef855699786a9ac5386ea8 [formerly caf1f1fdf7]]
Former-commit-id: d7376844fc5a64a79ad485ae990bc811691e6589 [formerly d6feca69b4]
Former-commit-id: b6d567fd72
2013-04-12 07:55:56 -05:00
Steve Harris
23ba5b6690 Issue #1872 - Merge branch 'master_13.3.1' (13.3.1-19) into omaha_13.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/src/gov/noaa/nws/ncep/common/dataplugin/ncscd/NcScdRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java

Former-commit-id: 58848dbf11 [formerly 0d86b95f1b] [formerly 55d9909d6d] [formerly 58848dbf11 [formerly 0d86b95f1b] [formerly 55d9909d6d] [formerly 0fed14d765 [formerly 55d9909d6d [formerly 6dced3d81d2733f9f7c5f3d54cb123bf8ba055b2]]]]
Former-commit-id: 0fed14d765
Former-commit-id: 6f691692bb [formerly 55dda49d47] [formerly 9971801ff7675d72352d78bac25edb59dd4b1b9c [formerly fe6a078c64]]
Former-commit-id: 55c3e4f9cc9b0427394c00bf35baeeaf592f669f [formerly a9d3e94b3b]
Former-commit-id: 98fd30b0d5
2013-04-11 13:14:00 -05:00
Richard Peter
3438a72f90 Merge "Issue #1874 - created external properties files for specifying the number of grib decode threads" into omaha_13.4.1
Former-commit-id: 7816a9baa7 [formerly b29d274316] [formerly a244fe0cd0] [formerly 7816a9baa7 [formerly b29d274316] [formerly a244fe0cd0] [formerly 7f25a86e4d [formerly a244fe0cd0 [formerly cd417d34a230322f80dd48eb59416c938697320d]]]]
Former-commit-id: 7f25a86e4d
Former-commit-id: 15d71da33c [formerly 8c91f737ba] [formerly a7c21f40d383d897d678d7ec0012da4e96ed8550 [formerly 830ec7274c]]
Former-commit-id: 99953595a248d6869d12f05b1c114ec8d9100fc4 [formerly c0e4cca8a4]
Former-commit-id: a1228d7830
2013-04-10 16:57:38 -05:00
Bryan Kowal
39990c9ded Issue #1874 - created external properties files for specifying the number of grib decode threads
- there is now one property for the number of threads
- the property is now used to set the number of concurrent consumers

Change-Id: I5e0c39928d1f3b92ad2875e6b720c9dde1b779ff

Former-commit-id: d1799b4e0f [formerly 4ef22f8e93] [formerly eb04d2b85f] [formerly d1799b4e0f [formerly 4ef22f8e93] [formerly eb04d2b85f] [formerly b5994702dc [formerly eb04d2b85f [formerly deeab1e1074fec2d62e55760d9fe45ec7379b9f8]]]]
Former-commit-id: b5994702dc
Former-commit-id: 2393357287 [formerly fa1e0a02b0] [formerly e08966d5518c4d5452b179ec7af6e2e7ae211afb [formerly a60f14f5d6]]
Former-commit-id: 3dc62f85f55a788efee36beacca6b2db42c94fc7 [formerly 2ac40dd058]
Former-commit-id: d64370525b
2013-04-10 16:24:39 -05:00
Richard Peter
2f8f73d462 Merge "Issue #1893 Switch machine to be LOCAL instead of using RuntimeMXBean" into omaha_13.4.1
Former-commit-id: 64f626df2f [formerly 429d562563] [formerly 060cf5b326] [formerly 64f626df2f [formerly 429d562563] [formerly 060cf5b326] [formerly a31dec3cc8 [formerly 060cf5b326 [formerly 203a91a2d673329199e9fecc8bf2f171bd524cc2]]]]
Former-commit-id: a31dec3cc8
Former-commit-id: 6d3b5b48a2 [formerly 148776865f] [formerly 4e6c97c2107840be526d25ac2707d719db6ce7b7 [formerly 558812ff6e]]
Former-commit-id: 25a86700d5e58db9cf9dd18e483ad9a379a6bdc8 [formerly 70b9220889]
Former-commit-id: 5279ca8c53
2013-04-10 14:40:36 -05:00
Ben Steffensmeier
89a467ec1f Issue #1893 Switch machine to be LOCAL instead of using RuntimeMXBean
Former-commit-id: aa7aa88ee5 [formerly 26b8938242] [formerly d727b93273] [formerly aa7aa88ee5 [formerly 26b8938242] [formerly d727b93273] [formerly d0070fcec4 [formerly d727b93273 [formerly f9eb42deebaab88fb9f1bbee54537e62acdc72fa]]]]
Former-commit-id: d0070fcec4
Former-commit-id: 593b2db92e [formerly 3c48093ab4] [formerly b0644c1ff0d4582d8483cacd6d9b031f086c5bb9 [formerly 0ac1b41eeb]]
Former-commit-id: cc6bd2170efc755a9da740f98d30dc00a75113c7 [formerly ea7aa6d647]
Former-commit-id: bb96a2e866
2013-04-10 14:09:47 -05:00
Mike Duff
835be943a0 Issue #1786 - Initial checkin of https for thin client
Code review comments

Change-Id: I1fde9a276ecca44d87603be08a99232a5d7b441e

Former-commit-id: 60a6fb451c [formerly f584e17aa7] [formerly b9abbcdf37] [formerly 60a6fb451c [formerly f584e17aa7] [formerly b9abbcdf37] [formerly 0a33734e6f [formerly b9abbcdf37 [formerly 6f206dad8ffbbd7b793b92b8a23bbce74a5b0017]]]]
Former-commit-id: 0a33734e6f
Former-commit-id: 173c3e105a [formerly 080bb15b65] [formerly 2be236391b1c5cf5192a6941173792def17ad162 [formerly fd55f6ed42]]
Former-commit-id: 3a8401fb2e96b573816c64579acf4a752d3fa080 [formerly c1a7a62e5b]
Former-commit-id: 657bb56bf0
2013-04-10 10:29:33 -05:00
Max Schenkelberg
872981ef0a Issue #1638 Added cache of PluginDao objects in PluginFactory so they can safely cache data internally by not being recreated every store operation. Added default names to sample actions
Amend: Create copy on write for PluginFactory

Change-Id: I5373d1efadc1ab3c5e368a3caae55a5ff85a2d6f

Former-commit-id: cc26fc686f [formerly 1bec335fd7] [formerly 6e70b21f5f] [formerly cc26fc686f [formerly 1bec335fd7] [formerly 6e70b21f5f] [formerly b695de3698 [formerly 6e70b21f5f [formerly 4249c63fb4ee62862cb9bbaa36d47607ba6784e8]]]]
Former-commit-id: b695de3698
Former-commit-id: abb23e3ee8 [formerly e369546b51] [formerly 816648a0ce9802fedb4f45d07b440f60e6c7efab [formerly f2a0f8223a]]
Former-commit-id: 257a44306e905e1ce64214b821c893efbd679a91 [formerly 0b2fed1f34]
Former-commit-id: f1617ea662
2013-04-10 10:04:17 -05:00
Dustin Johnson
511111545c Issue #1826 Remove delivery/notify options for subscriptions
Change-Id: Ife37bb70a5b54c3602d5f73de337cb83f37a9509

Former-commit-id: ba51d9a911 [formerly f3526508f3] [formerly 11fd2d676b] [formerly ba51d9a911 [formerly f3526508f3] [formerly 11fd2d676b] [formerly 6bc69df127 [formerly 11fd2d676b [formerly 0bf00ff025ea916aeb0ee4cb093163cbd9cfe931]]]]
Former-commit-id: 6bc69df127
Former-commit-id: a93be0ad07 [formerly 0578916ec1] [formerly 481cf7d3351795f1186b2ad2e6947bdd0e75d0ee [formerly b78f56f1ca]]
Former-commit-id: 01d40a67a07f6599feaec5703ba0f20d1c79f019 [formerly b61292ce4d]
Former-commit-id: 60e910e3d3
2013-04-09 11:40:25 -05:00
Steve Harris
b6db7821fa 13.3.1-19 baseline
Former-commit-id: 196767d525 [formerly dc9fef33a9] [formerly 9be238bcc4] [formerly 196767d525 [formerly dc9fef33a9] [formerly 9be238bcc4] [formerly abaf9f12f9 [formerly 9be238bcc4 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]]]
Former-commit-id: abaf9f12f9
Former-commit-id: fe5020d315 [formerly ed4150db5f] [formerly afa8971d2a4b49801835997c9e04d909cbb5917c [formerly 340a2cfb23]]
Former-commit-id: 8178539bb83f1e27afa01a5dd82705a3f18fc420 [formerly 7d76371536]
Former-commit-id: 7b7efd0bd1
2013-04-09 08:37:12 -05:00
Richard Peter
7225ebfc16 Merge "Issue #1293 - remove hdffileid and create delta script to update existing databases" into omaha_13.4.1
Former-commit-id: 9cdbdbfd33 [formerly 0abecda3d1] [formerly aba25dc7c4] [formerly 9cdbdbfd33 [formerly 0abecda3d1] [formerly aba25dc7c4] [formerly e95911f615 [formerly aba25dc7c4 [formerly ecf4556f6bf0b1ca13013a0f5143a0f840218a13]]]]
Former-commit-id: e95911f615
Former-commit-id: 62a78ea4f2 [formerly c9afa907cd] [formerly f6aa539f4fd427c0baeaf1aa88fa654fe1a37b84 [formerly afef66b87e]]
Former-commit-id: 095c33421d535f5865818556b5c005c1cdad2717 [formerly 0c2f84de7f]
Former-commit-id: bde2fdcbf8
2013-04-08 14:20:09 -05:00
Bryan Kowal
155c0efbef Issue #1293 - remove hdffileid and create delta script to update existing databases
- now in the 13.4.1 branch


Former-commit-id: 885dd56459 [formerly e92e2712da] [formerly 4cc9a742c8] [formerly 885dd56459 [formerly e92e2712da] [formerly 4cc9a742c8] [formerly c08190a586 [formerly 4cc9a742c8 [formerly f58fa2c5360cdbf38580bb675d2acdc8cb6b438e]]]]
Former-commit-id: c08190a586
Former-commit-id: ea86a8ba59 [formerly eea02ee972] [formerly 0bd4d2c02ecc3f80e814b1c7593bcf9ddb429c21 [formerly 55f234c2d1]]
Former-commit-id: c0b00876a3491930673c6dd9710f08611caea242 [formerly 7bfabf4a4e]
Former-commit-id: 4f8d471c5e
2013-04-08 14:04:05 -05:00
Steve Harris
1088d433a2 Issue #1872 - added the edexOsgi/build.edex/esb/bin/yajsw/ content for rpm builds
Former-commit-id: 7266d7a21b [formerly 2711be871a] [formerly 53492c2902] [formerly 7266d7a21b [formerly 2711be871a] [formerly 53492c2902] [formerly 84370207a1 [formerly 53492c2902 [formerly da94d1f4ffc37edd53f17118c0b4420dd6500099]]]]
Former-commit-id: 84370207a1
Former-commit-id: 45c85dd1c9 [formerly 5f5dd9a031] [formerly b59b7953bfb271cf949146d04a64ce7f94879dce [formerly 0105f15306]]
Former-commit-id: da80ca83144911a3ccad05cbf246571e7e073e3c [formerly ee08ef663f]
Former-commit-id: 0e857a47e9
2013-04-08 13:47:34 -05:00
Greg Armendariz
b12da8daff Issue #1872 - Add Jensen's build fix
Former-commit-id: bde00389a1 [formerly 8b2d3f7b00] [formerly fba9de785d] [formerly bde00389a1 [formerly 8b2d3f7b00] [formerly fba9de785d] [formerly 0e2b440b86 [formerly fba9de785d [formerly ea5a1fa7de2acd53dcdb510ed42326153857a146]]]]
Former-commit-id: 0e2b440b86
Former-commit-id: 86ebf238ec [formerly 274c0a9c26] [formerly 9a171344cbbd9bfea849b24b1159aabbe11ef8cd [formerly ea340322bb]]
Former-commit-id: b38396a7218ef7780824e7308e7ea9b9a2765cd4 [formerly 190d2b79ad]
Former-commit-id: d25ec9c02c
2013-04-08 12:26:20 -05:00
Dustin Johnson
e7301e95c9 Issue #1841 Split up PendingSubscription hierarchy in support of shared subscriptions.
Add ability to store/approve shared subscriptions.
Back out generics on subscription/pending subscriptions until guis are updated.

Change-Id: I84e1651ebcad0d398396752529981f28dbc341bf

Former-commit-id: 3a6d9209df [formerly cef805e79a] [formerly 61346b1388] [formerly 3a6d9209df [formerly cef805e79a] [formerly 61346b1388] [formerly f3bdede2c8 [formerly 61346b1388 [formerly 5a8249a78daaeed19079e78f6c4f07b08e817ff0]]]]
Former-commit-id: f3bdede2c8
Former-commit-id: 73a8bb7a02 [formerly 4b4eb8e406] [formerly da2f137f6b51f8ac36c0d76f597f0c82e1dfd829 [formerly 8c52cd190f]]
Former-commit-id: 58e02dc2dcf3d6a21fbf5672b90de97e43258d5e [formerly fefc0dca3b]
Former-commit-id: 5958178516
2013-04-05 12:41:02 -05:00
Bryan Kowal
4ed0425a3f Issue #1873 - reduce EDEX shutdown time
Former-commit-id: 18a90e6bca [formerly b252ca6506] [formerly bec051d00a] [formerly 18a90e6bca [formerly b252ca6506] [formerly bec051d00a] [formerly 82a1b0752e [formerly bec051d00a [formerly 954e71e2a22252cf62041be5ee0c5de7f1418298]]]]
Former-commit-id: 82a1b0752e
Former-commit-id: 2fc926dc40 [formerly e05b72b17e] [formerly d030cb4771604922e5386d6770711033242b5fef [formerly 3bd9819e59]]
Former-commit-id: 5b4e90f0820e473351ff58c67ece4e3000f80c53 [formerly 0285965657]
Former-commit-id: 82db2880b7
2013-04-04 17:36:09 -05:00
Dustin Johnson
ef062dc2a2 Issue #1872 Fix compile errors
Change-Id: Ic70a61c30bbe8ff4768a8079beb5be5f9336876a

Former-commit-id: ff6f1dc67a [formerly ec85cdcf8c] [formerly 7cf482512d] [formerly ff6f1dc67a [formerly ec85cdcf8c] [formerly 7cf482512d] [formerly 06e6d84273 [formerly 7cf482512d [formerly 2b84d1a58c99858784294bf32b293f8a54c38ecd]]]]
Former-commit-id: 06e6d84273
Former-commit-id: ba666a0216 [formerly 9531e50cac] [formerly 59856ee7614cee35d409908965a9a266ed5ee207 [formerly add67ae3dc]]
Former-commit-id: 9cc05353119d0dc071ed85a0d3b14dc1ff4ab10d [formerly 64b2560d05]
Former-commit-id: bf97f2e7d2
2013-04-04 16:44:57 -05:00
Roger Ferrel
34010df840 Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned.
Change reviewer comments.

Change-Id: Ida69b63198ffa5c229eedd3abb42c4f5f9e1d00d

Former-commit-id: 50ffd4082b [formerly 90dae591a6] [formerly 998714524d] [formerly 50ffd4082b [formerly 90dae591a6] [formerly 998714524d] [formerly b00d64ec0a [formerly 998714524d [formerly 882f96509c19f0621a4f6e6806e3177f6c566562]]]]
Former-commit-id: b00d64ec0a
Former-commit-id: ef8461965e [formerly 5c4a938c72] [formerly 3ba9851638529124c64d3eb3b31a74ca7dd0db71 [formerly 8c5f3fb8f7]]
Former-commit-id: af45db73b891a4a828963709b4fdc2c7e21c4347 [formerly da4b43a4fc]
Former-commit-id: 59bb22e52b
2013-04-04 13:22:10 -05:00
Max Schenkelberg
509942bffc Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
Change-Id: I37c3135794c991e2405d556823a22768dd491f00

Conflicts:

	cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSDataCallback.java


Former-commit-id: a5994b8983 [formerly be574276f9] [formerly 6d0960c4ef] [formerly a5994b8983 [formerly be574276f9] [formerly 6d0960c4ef] [formerly b042037a67 [formerly 6d0960c4ef [formerly ed981dc2487d169a502f7396520899fc55ff3299]]]]
Former-commit-id: b042037a67
Former-commit-id: c8e0d2ca98 [formerly fb1a6e203b] [formerly 79c9f6bf695445a8d8715c158cdad1b211214ced [formerly 1b81c79b13]]
Former-commit-id: b54658d12950068a772a67b068d99d660f27a3a9 [formerly 95e73c34f9]
Former-commit-id: 61f17d8d34
2013-04-04 13:21:35 -05:00
Dustin Johnson
7dbb9acf53 Issue #1815 Move DD phase3 code to 5-Data_Delivery
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425

Conflicts:

	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/DefaultLayerCollector.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerCollector.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerHolder.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerTransformer.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/SimpleDimension.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/SimpleLayer.java
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/res/spring/grib-dpa-ingest.xml
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/src/com/raytheon/uf/edex/plugin/grib/ogc/GribLayerCollector.java
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/build.properties
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/res/spring/obs-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/res/spring/obs-dpa-ingest.xml
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/src/com/raytheon/uf/edex/plugin/obs/ogc/metar/MetarLayerCollector.java
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/src/com/raytheon/uf/edex/plugin/obs/ogc/metar/feature/Metar.java
	edexOsgi/com.raytheon.uf.edex.topo/src/com/raytheon/uf/edex/topo/StatusConstants.java
	edexOsgi/com.raytheon.uf.edex.wcs/src/com/raytheon/uf/edex/wcs/reg/DefaultWcsSource.java
	edexOsgi/com.raytheon.uf.edex.wms/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/reg/DefaultWmsSource.java
	edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/styling/ColormapStyleProvider.java
	edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/util/ColorMapUtility.java


Former-commit-id: af4da9286b [formerly dbeffa91fe] [formerly 375f0801a2] [formerly af4da9286b [formerly dbeffa91fe] [formerly 375f0801a2] [formerly 3c41127c42 [formerly 375f0801a2 [formerly 0b38c35370237a6215bb2eba9347de9b9f0a7ea1]]]]
Former-commit-id: 3c41127c42
Former-commit-id: 94002b3be9 [formerly 9a4f4431de] [formerly 1aa6cc2e6bc2ae28b658d5879fe7eb65cc4a7b70 [formerly 0dc74710ce]]
Former-commit-id: 3bc02ea1c6075b3b5e6394a15bdba67e6052ad17 [formerly 32da016541]
Former-commit-id: ce87841d63
2013-04-04 13:10:24 -05:00
Richard Peter
3abc53b70d Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client
Merge local virtualHosts.xml back in with SLC change

Change-Id: Ia0f08a1d916895d33db9f170149cb9b05e00375b

Former-commit-id: 1d7d360f2c [formerly 91d708eaac] [formerly f77948929d] [formerly 1d7d360f2c [formerly 91d708eaac] [formerly f77948929d] [formerly 814bff6ddb [formerly f77948929d [formerly 20bbd926451ce82c606d80b238c5fbc720164910]]]]
Former-commit-id: 814bff6ddb
Former-commit-id: d1369dbf29 [formerly e9fe732dac] [formerly ce08d17392a7953ce37dadfeeddad3576552db03 [formerly 4337abd873]]
Former-commit-id: f0de5f6f544fadd3b91519c8f6322d053c734a6f [formerly 055440acda]
Former-commit-id: 52533b4f49
2013-04-04 13:03:41 -05:00
Bryan Kowal
2bc13fa033 Issue #1663 - awips2-database will no longer install site-specific databases.
- removed the sql scripts for the obsolete hydro databases
- the hydro databases will now be installed by the site-specific localization rpms
- the database imports and associated db files that are not actually part of localization
  will be purged by the localization rpm once it is finished with them

Change-Id: I631395db0688d858a280bcdc01aa8b70dc2eb1c6

Former-commit-id: ce08162045 [formerly 991de38661] [formerly a8d4e8f6ec] [formerly ce08162045 [formerly 991de38661] [formerly a8d4e8f6ec] [formerly 3d04b0f87b [formerly a8d4e8f6ec [formerly 5691e7ffdcf695ea28726212c1a8604607e35427]]]]
Former-commit-id: 3d04b0f87b
Former-commit-id: 1147a05bcf [formerly a214ee536a] [formerly 98c4ccb22060dd1661aa24f92d73ea9c175710d4 [formerly a154e3b3cd]]
Former-commit-id: ae924e9e5aad49a5024c850fb5b892c8ea59c34b [formerly 040bf63b7f]
Former-commit-id: f785bd78aa
2013-04-04 13:03:08 -05:00
Roger Ferrel
7af3402ffc Issue #1807 Change DbQueryHandler to include order by informaton in the query.
Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48

Former-commit-id: 1fb0666a69 [formerly 24e5e7ff35] [formerly 4e607bc7bf] [formerly 1fb0666a69 [formerly 24e5e7ff35] [formerly 4e607bc7bf] [formerly 2cd455764b [formerly 4e607bc7bf [formerly 79d768ff4df2d866aaea4dc8d2197cf190eb2809]]]]
Former-commit-id: 2cd455764b
Former-commit-id: e1d9065706 [formerly df1c674ba0] [formerly 2c437b337b3e7accdbe6bd644d0cb84ad0153430 [formerly 97fdbb2477]]
Former-commit-id: 21e45aae935e3c8e9d886eadc4e91174180fc3a6 [formerly d5628c3291]
Former-commit-id: 9125683187
2013-04-04 13:02:58 -05:00
Bryan Kowal
cec925409e Issue #1663 - name the default geometry column
Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27

Former-commit-id: f81212d444 [formerly d35246ef31] [formerly 267b2c4dfa] [formerly f81212d444 [formerly d35246ef31] [formerly 267b2c4dfa] [formerly 37d869ef60 [formerly 267b2c4dfa [formerly 2a8a3a3dab4d3e816bdb484ac94f456a80cd2616]]]]
Former-commit-id: 37d869ef60
Former-commit-id: 20d58ef413 [formerly 1ce9d40711] [formerly f85c6a8bcab56873e52500a8858a7ccc31a3523f [formerly 6eec333843]]
Former-commit-id: cbfeab4cef29cec446efad18a407e90e393d4266 [formerly 8723415965]
Former-commit-id: 15ec53b037
2013-04-04 13:01:09 -05:00
David Gillingham
f93534ccda 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

Conflicts:

	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py


Former-commit-id: aaddb9cd58 [formerly 5ae3fbd325] [formerly d24fcc85e2] [formerly aaddb9cd58 [formerly 5ae3fbd325] [formerly d24fcc85e2] [formerly 56235e370f [formerly d24fcc85e2 [formerly 37020656f1502afee59e41ed7daf16775e200cbf]]]]
Former-commit-id: 56235e370f
Former-commit-id: fd639744bf [formerly b97b1766ee] [formerly 0808d1706a10907ff236663e85686c504930a1cb [formerly 60e8146a18]]
Former-commit-id: 81927e913ca50f9b6ae9e04730c6d1253d5dc832 [formerly a49920c978]
Former-commit-id: cdba87a6f3
2013-04-04 13:00:36 -05:00
Bryan Kowal
0cbefb8b77 Issue #1663 - PostgreSQL Upgrade
- we are now building PostgreSQL 9.2.3 and psql 9.2.3 from source
- we are building pgadmin3 1.16.1 from source
- we can build both a 32-bit and 64-bit version of PostgreSQL, psql, and pgadmin3
- the following extensions are also built with PostgreSQL:
   * geos 3.3.7
   * postgis 2.0.2
   * proj 4.8.0
   * gdal 1.9.2
- database creation scripts and configuration have been updated for compatibility
- removed remaining references to prefixed psql and postgresql rpms
- removed unused sql scripts from the baseline
- we are now using modified versions of the PostgreSQL 9.2.3 postgresql.conf file
- updated the postgresql jdbc drivers

Change-Id: Ibe61cfcb2540cd4d8b9fae492688109d8bd715d8

Former-commit-id: 321660e016 [formerly 211307edfd] [formerly 9e99447eee] [formerly 321660e016 [formerly 211307edfd] [formerly 9e99447eee] [formerly 4fd4786ae5 [formerly 9e99447eee [formerly 8faf829eb0a8721093a181fe1335d5ee15a1fbaa]]]]
Former-commit-id: 4fd4786ae5
Former-commit-id: d6b11bacf0 [formerly d40863c38f] [formerly dced69266300d616b3126d8ab0a9ce82349c7fc0 [formerly fcc7b102ad]]
Former-commit-id: df080e66e266ed5db77210502282ac3ed02a0060 [formerly 887b7d9c1a]
Former-commit-id: aab6cce629
2013-04-04 12:56:58 -05:00
Mike Duff
644d0582c8 Issue #1646 - Format the output
Change-Id: I2cf00e194fdb65f37c4c0e2763140bfcc4f46ed6

Former-commit-id: ea0cd457ac [formerly 2e424cd74a] [formerly 4ab07a31da] [formerly ea0cd457ac [formerly 2e424cd74a] [formerly 4ab07a31da] [formerly d5d4ed7327 [formerly 4ab07a31da [formerly 337e2e2da520492b10864ef9f98130c5c19e0448]]]]
Former-commit-id: d5d4ed7327
Former-commit-id: 6024d7fb50 [formerly 57fa0f2ef9] [formerly 44825e8261549149e51d6e8f7a6835db9fa371e9 [formerly aefbc4f54f]]
Former-commit-id: d60de1114b3cb0cc087cb065d38f913c47f4d49c [formerly 0901f42fc9]
Former-commit-id: cbca9678b4
2013-04-04 12:56:44 -05:00
David Gillingham
d1c9eafce6 Issue #1759: Refactor PurgeGfeGridsRequestHandler and IscMakeRequestHandler to not use
GfeScriptExecutor and GfeScript.

Change-Id: If3c789549a071e54f9020433f6221e688c51c44a

Conflicts:

	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF


Former-commit-id: 493814adf5 [formerly 05f52e6e54] [formerly 055c36ea41] [formerly 493814adf5 [formerly 05f52e6e54] [formerly 055c36ea41] [formerly 0969f85246 [formerly 055c36ea41 [formerly 45846ffc137ef816dc149f3f9e46b99dbe608897]]]]
Former-commit-id: 0969f85246
Former-commit-id: bde4f4c03d [formerly 2038a703ac] [formerly e974a975769591433b0e949683524759177531b9 [formerly 8859674c70]]
Former-commit-id: 6e1a2c4d26a3a7eaeff11a8731cdb9124c405871 [formerly 184bb9e966]
Former-commit-id: 7eb15969fb
2013-04-04 12:46:21 -05:00
Steve Harris
084125dd3c Merge branch 'omaha_13.3.1' into development
Former-commit-id: 4dfea33cdd [formerly 9879b94de9] [formerly 8b607f8228] [formerly 4dfea33cdd [formerly 9879b94de9] [formerly 8b607f8228] [formerly 5c9a6b83cc [formerly 8b607f8228 [formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]]]
Former-commit-id: 5c9a6b83cc
Former-commit-id: bbfc0f76ef [formerly 0f53c46d7a] [formerly 0738423fc8a58844573f709645061e99d15cff90 [formerly ed8c0487fe]]
Former-commit-id: 55bdcb43db4e6090118e9aec0586c1a76860abe3 [formerly 7eda24c3b0]
Former-commit-id: a7b174bfaf
2013-04-04 11:58:50 -05:00
Steve Harris
114eec390d Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1
Former-commit-id: 77c0dd0b55 [formerly 2bc12f7a23] [formerly 0f000f4485] [formerly 77c0dd0b55 [formerly 2bc12f7a23] [formerly 0f000f4485] [formerly 327d05f3b5 [formerly 0f000f4485 [formerly 131cf22b16b3109fdc13a8346524fc8d2e230b7f]]]]
Former-commit-id: 327d05f3b5
Former-commit-id: b2de6fd4c1 [formerly 0342b648b6] [formerly 17693382994fce6acddb70eda705f85cda502c1d [formerly c7b9690456]]
Former-commit-id: cbf659d2aeb98a7a61aa0b89fa053b8445f63a9f [formerly f22108c973]
Former-commit-id: dc0baf57ba
2013-04-03 15:52:19 -05:00
Richard Peter
f03594dc87 Merge "Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode." into omaha_13.3.1
Former-commit-id: 7d2b8a7576 [formerly 920ba0628c] [formerly d282a49b6f] [formerly 7d2b8a7576 [formerly 920ba0628c] [formerly d282a49b6f] [formerly 6d73e25290 [formerly d282a49b6f [formerly af61ff08574c9c32518f02a4629aa2786e609ec2]]]]
Former-commit-id: 6d73e25290
Former-commit-id: dcc6ca7202 [formerly 8ac6ae3539] [formerly dc7cbd6d3f910f10adee39b3fe760360f1e82888 [formerly 64dc5c4d23]]
Former-commit-id: 54bea0b83fc5bd1c3cc475f07d09468710cce778 [formerly 0548ee285d]
Former-commit-id: 75a2845464
2013-04-03 15:14:17 -05:00
Richard Peter
3215738fd4 Merge "Issue #1661 - yajsw will now log to both the console and log file indefinitely" into omaha_13.3.1
Former-commit-id: f0450ff6f2 [formerly dd527a4ef2] [formerly cbbd9ab90d] [formerly f0450ff6f2 [formerly dd527a4ef2] [formerly cbbd9ab90d] [formerly cfcacd20e9 [formerly cbbd9ab90d [formerly 1fe96f5c55b7927b3794cdb36217fdbe032235c4]]]]
Former-commit-id: cfcacd20e9
Former-commit-id: bddc4b1bdf [formerly d973d83519] [formerly a8e4b972144335b974c48d4fadd8845f75b550f0 [formerly 58908a0fd7]]
Former-commit-id: 3332bf3bb5bf9062085e62fc233a2fd0b8b7dbdc [formerly d2dd57fee4]
Former-commit-id: aca16ca6f9
2013-04-03 15:13:26 -05:00
Steve Harris
0cd73a41a1 13.3.1-18 baseline
Former-commit-id: e621424fcb [formerly f3e79bcc9d] [formerly a2b098d86d] [formerly e621424fcb [formerly f3e79bcc9d] [formerly a2b098d86d] [formerly ce6a06a7e3 [formerly a2b098d86d [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]]]
Former-commit-id: ce6a06a7e3
Former-commit-id: a196ebc11b [formerly 0edd049e3b] [formerly 6155a83f5aa46637b96708a2e4492a382c4e5e79 [formerly bf6c3b6762]]
Former-commit-id: 88c12203c6853385a029c2fa9c3bdc8048aff152 [formerly 044912d48b]
Former-commit-id: fc009792e3
2013-04-03 14:58:29 -05:00