Commit graph

2028 commits

Author SHA1 Message Date
Brian Clements
62ce9cd76a Issue #2608 quartz components use single scheduler
configured quartz components to use a single scheduler
added workaround to camel limitation which requires management name set on context
added quartz properties file copied from the quartz jar (can be used to set thread count)


Former-commit-id: 16b34af5a8 [formerly f1c3efdd0e] [formerly 3959c9e023] [formerly 16b34af5a8 [formerly f1c3efdd0e] [formerly 3959c9e023] [formerly 1a5991dcf5 [formerly 3959c9e023 [formerly 2b16524026b3c8834e5846f8cd800ae4e1a95e07]]]]
Former-commit-id: 1a5991dcf5
Former-commit-id: 32bd012ee7 [formerly 1708f1c350] [formerly 8e0e1ea619f2364f9bacc1be3d52e01d6a4500f8 [formerly f0b260d1ce]]
Former-commit-id: 8b613f48d83eb607e6cb702166549c20dd5d2a20 [formerly d62dd50b7b]
Former-commit-id: b18c7dcee6
2014-01-14 08:43:21 -06:00
Brian Clements
a9b355cfa8 Issue #1998 fixed NPE in PointDataPluginDao
StorageStatus was not being checked after operation


Former-commit-id: 9686c8fab1 [formerly f0c1b109f8] [formerly 401cd813f1] [formerly 9686c8fab1 [formerly f0c1b109f8] [formerly 401cd813f1] [formerly 1e6ae5a98e [formerly 401cd813f1 [formerly 82736d581767831f426a17b0ee9d264fdda7dd64]]]]
Former-commit-id: 1e6ae5a98e
Former-commit-id: 7d7ce21036 [formerly 6baf80fc5c] [formerly 94475c71324a05087908449a3190bdfa39879b6a [formerly 25765f2fb6]]
Former-commit-id: 0ee84fa81037d604d46cfc60d0b1e8e51ec86628 [formerly 7d4cfb14a5]
Former-commit-id: ea9296958c
2014-01-09 14:02:52 -06:00
Slav Korolev
ac5540213e Issue #2653. Corrected decoding of SNOW monitor data.
Former-commit-id: 696728bafd [formerly 5bbb774073] [formerly 714fd018ef] [formerly 696728bafd [formerly 5bbb774073] [formerly 714fd018ef] [formerly ab7fc816b4 [formerly 714fd018ef [formerly 050f002ff7af3e68c31f5c1949ff5f82fa2e7a9b]]]]
Former-commit-id: ab7fc816b4
Former-commit-id: 679b61deea [formerly eb5ec35275] [formerly 5aa04e4abf5d9d29b644d2a212f6393c065cce96 [formerly 0fb9810e91]]
Former-commit-id: 9c64be7095aadcd4adef7f3b53b64c6684b3b86d [formerly 4fd070dd46]
Former-commit-id: 4c3ce254b6
2014-01-07 11:48:13 -05:00
Max Schenkelberg
e0b7ba7058 Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index

Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5

Former-commit-id: 30059d255c [formerly b3aed99142] [formerly 16046a4dde] [formerly 30059d255c [formerly b3aed99142] [formerly 16046a4dde] [formerly cc2080449c [formerly 16046a4dde [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]]]
Former-commit-id: cc2080449c
Former-commit-id: 257553461b [formerly 0ceaa43902] [formerly d612c358920d902e7385e86659fc1d050de57dd4 [formerly f58795f460]]
Former-commit-id: e6116ab5b34627162fc751f613c0b7f4743d9668 [formerly 789a279475]
Former-commit-id: 783391423f
2014-01-06 17:03:45 -06:00
Steve Harris
547577784f Merge branch 'omaha_14.2.1' into development
Former-commit-id: 36b228cc7f [formerly 8aac57e096] [formerly 0950a8a1ba] [formerly 36b228cc7f [formerly 8aac57e096] [formerly 0950a8a1ba] [formerly 64f8564cd8 [formerly 0950a8a1ba [formerly 71a8fd9b0659b06e366e734c06fa74232787238b]]]]
Former-commit-id: 64f8564cd8
Former-commit-id: 0a47657ba3 [formerly 21aaafbd52] [formerly d06360f4d96492a1e44ce6135ec70d7fc3b2bcbf [formerly 5d6bae317d]]
Former-commit-id: 94eb7477ee0e10f6b0a819a42d1f575a968062b8 [formerly bb449e689e]
Former-commit-id: afb79e8384
2013-12-18 13:14:27 -06:00
Richard Peter
08d2290f97 Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7

Former-commit-id: cc89b16338 [formerly e4f59ea119] [formerly 1de516964b] [formerly cc89b16338 [formerly e4f59ea119] [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 1de516964b [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 73f12bf669 [formerly 5c0cf804f1] [formerly 2e1688da3b0fce728ce5f4d9180206023aa31cf3 [formerly 62fa535744]]
Former-commit-id: 3e8093536581ac6595438ca5eb497ae394fe30e8 [formerly 4059813742]
Former-commit-id: 1c743d4d44
2013-12-17 21:04:53 -06:00
Nate Jensen
edec29453c Merge "Issue #2574 fix DatabaseQuery conversion of grid coverage objects. Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309" into omaha_14.2.1
Former-commit-id: 72621bcf14 [formerly 29425906ba] [formerly 66f5000243] [formerly 72621bcf14 [formerly 29425906ba] [formerly 66f5000243] [formerly 84e3cf0988 [formerly 66f5000243 [formerly 69cbbcc3c88565c35c1453412f031669306adf0f]]]]
Former-commit-id: 84e3cf0988
Former-commit-id: 68909c095c [formerly eee649c9b1] [formerly 2d09d28c746d8705ac32468202e80b2c778e0ef6 [formerly 42bd8ccde4]]
Former-commit-id: def329c30b90522d385bb738bac8a14453b5496c [formerly 3141f76bff]
Former-commit-id: cd9dec3e57
2013-12-17 12:20:37 -06:00
Brad Gonzales
2fd6d50617 Issue #2636 fixes for the scheduling gaps in the middle of subscription schedules.
Amend: Added max checks to prevent negative bucket sizes in RetrievalPlan remove methods.  Wrapped debug logging in is debug on checks.

Change-Id: I5ab6d3c103e82bf2b1aa0eaf167f0993e5778c90

Former-commit-id: 8e26f2a99c [formerly 253cc9df80] [formerly cc75442fa3] [formerly 8e26f2a99c [formerly 253cc9df80] [formerly cc75442fa3] [formerly b2b352a5ae [formerly cc75442fa3 [formerly 3db5d79b914436b8d0feed600fc586d7d3884706]]]]
Former-commit-id: b2b352a5ae
Former-commit-id: 38198d379b [formerly 6e78d3a521] [formerly b11a7f8006104e7102802aa4735db3bf8c3aaff8 [formerly 0df42dacfd]]
Former-commit-id: d94d9163be833c49e9da0c0ffbb86ce778b60899 [formerly 4f6b8a79bb]
Former-commit-id: f71ea9eeb4
2013-12-17 11:57:06 -06:00
Brad Gonzales
af8b8cf0f5 Issue #2635 Remove unneeded retrieval plan plan for sbn data on the wfo.
Change-Id: Icb4ce20d0fa5c8bfc8af90020bbdcade0c396168

Former-commit-id: b4b51de862 [formerly d329fc26bb] [formerly d324400d65] [formerly b4b51de862 [formerly d329fc26bb] [formerly d324400d65] [formerly d0ae47d053 [formerly d324400d65 [formerly f4c1739687685a22847a09490724e84825032146]]]]
Former-commit-id: d0ae47d053
Former-commit-id: 413d6e83d3 [formerly 729ab5d41e] [formerly 230f64f02e7a5999b7f549e68cba93e994622dda [formerly 8476a13e41]]
Former-commit-id: 71ca5ec5cbf790259ccbbf23ade4ec069ca5e700 [formerly f0f1abea6b]
Former-commit-id: b12fc921a5
2013-12-17 09:43:12 -06:00
Bryan Kowal
c8e49142f2 Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
Amend: wrap file access in try..finally; move StringBuilder outside of a loop

Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da

Former-commit-id: b2550c873b [formerly 0c3b22c8f2] [formerly 43008f4698] [formerly b2550c873b [formerly 0c3b22c8f2] [formerly 43008f4698] [formerly 120ebd045a [formerly 43008f4698 [formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]]]
Former-commit-id: 120ebd045a
Former-commit-id: a63bda59b4 [formerly 68181d3f62] [formerly 1ab6f3920db4e2de42353fe97a9c4fe694df0851 [formerly fac9d72cc8]]
Former-commit-id: ea54fc6cf0eb39a2eb253d886a1e3180ccf382a0 [formerly 9e0e6662c8]
Former-commit-id: fad82481c1
2013-12-16 16:39:10 -06:00
Ben Steffensmeier
f497c0198c Issue #2574 fix DatabaseQuery conversion of grid coverage objects.
Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309

Former-commit-id: 89de68386a [formerly fb1480b30d] [formerly 7e5349bbff] [formerly 89de68386a [formerly fb1480b30d] [formerly 7e5349bbff] [formerly cc5d9edc92 [formerly 7e5349bbff [formerly 33033c354a783ab58d89599eb78355c6b354594f]]]]
Former-commit-id: cc5d9edc92
Former-commit-id: e6606cb28b [formerly 8a3bbbca50] [formerly 5acc5053cf8a5d78052a11afbf56473f1be1d712 [formerly 23a26f5d4a]]
Former-commit-id: 70565b5d18d4d2e7488c047a72edd91b385f7fb3 [formerly 9f30c14fca]
Former-commit-id: ca5fb7e3fa
2013-12-16 14:31:44 -06:00
Richard Peter
bb8784aab4 Merge "Issue #2170: Fix PluginNotifier direct-vm endpoints" into omaha_14.2.1
Former-commit-id: 66adb4939a [formerly 42d277364b] [formerly 3758a9532c] [formerly 66adb4939a [formerly 42d277364b] [formerly 3758a9532c] [formerly 84b64dac81 [formerly 3758a9532c [formerly 840448d17e58f7d98ebe09b7df17d2d5d4bb4a6f]]]]
Former-commit-id: 84b64dac81
Former-commit-id: 609d5ca4b6 [formerly 9230c9de2a] [formerly 87863d83afd45bf114f60dd6dfd2aa25f33d37f8 [formerly f4ba1cac8c]]
Former-commit-id: 1b65bfe43f2a94fb8f93f2027f756bce65abffc0 [formerly fcd5955a0f]
Former-commit-id: 4bd12a5840
2013-12-16 13:43:37 -06:00
Richard Peter
a4e73bf509 Merge "Issue #2613 Replication subscription start time correctly set" into omaha_14.2.1
Former-commit-id: 38d9d2fc40 [formerly 8b18800b95] [formerly 35299e917d] [formerly 38d9d2fc40 [formerly 8b18800b95] [formerly 35299e917d] [formerly 624c51e393 [formerly 35299e917d [formerly b21de50d989fa341b99c0632e908c6c1f7b6853f]]]]
Former-commit-id: 624c51e393
Former-commit-id: bcc4b0226d [formerly d0ef49d66c] [formerly bae8a12ce5cd2ad2ea2a1b4df29fdb25a1896deb [formerly c05162ed1a]]
Former-commit-id: 62106f422d134d8679ee3a2fbb171e3d3871817c [formerly 7125f2eca0]
Former-commit-id: 27716cb2fe
2013-12-13 16:09:13 -06:00
Mike Duff
7fb8d4e9b4 Issue #2545 - Prevent negatvie values in the BandwidthBucket's current size
Former-commit-id: 4a34562b6d [formerly 685c07cde0] [formerly b310cf0388] [formerly 4a34562b6d [formerly 685c07cde0] [formerly b310cf0388] [formerly eb591030d8 [formerly b310cf0388 [formerly f68aaea220b8ad7dcc886bb3bdeab362b977061e]]]]
Former-commit-id: eb591030d8
Former-commit-id: d4008334a7 [formerly ee5788ae5f] [formerly 9481ed3c4c2ed1bd3c5d860228b7afb95c3be678 [formerly 0deef9b6dd]]
Former-commit-id: 106a3ad6aefe02408a13e23349f5401e61cb3900 [formerly 4127267b78]
Former-commit-id: d8787f7eba
2013-12-13 16:03:36 -06:00
Benjamin Phillippe
c9d18d57eb Issue #2613 Replication subscription start time correctly set
Change-Id: I3d00be2b82282a339c7d13a085abe82ee36850d5

Former-commit-id: c793973916 [formerly dd218bb5e3] [formerly 70e6212353] [formerly c793973916 [formerly dd218bb5e3] [formerly 70e6212353] [formerly e0d32db91c [formerly 70e6212353 [formerly 6f3bc8a63cbd5480d65875815de4cdffa63c266c]]]]
Former-commit-id: e0d32db91c
Former-commit-id: 5e71dc4194 [formerly accf148cfd] [formerly 15a4a3cf716b317c2b8a2c64d5fa3e5461da8f2b [formerly 80c01c7117]]
Former-commit-id: 02e9b334555b8081a701b5263580e40c4694c6c6 [formerly 7d1f693fd9]
Former-commit-id: 822603235c
2013-12-13 14:17:11 -06:00
Richard Peter
745525da93 Issue #2170: Fix PluginNotifier direct-vm endpoints
Change-Id: If41bfdadbb4bc6ccda3d53f94d1ee493329f0b0c

Former-commit-id: 756baaefb8 [formerly cfd3810476] [formerly 595a655dfd] [formerly 756baaefb8 [formerly cfd3810476] [formerly 595a655dfd] [formerly 6267bee5d5 [formerly 595a655dfd [formerly b9415039acdc85ee7975e9d6bd27047cce623723]]]]
Former-commit-id: 6267bee5d5
Former-commit-id: 25033b31dc [formerly 21d9a7445d] [formerly b7b7dbef9f70f3c75516d4b5ef6990009c01f694 [formerly 55a21685ea]]
Former-commit-id: 67ba9bb63933aa2a4f10526f3d26766c10ab6062 [formerly 689a74ec89]
Former-commit-id: 84d7393161
2013-12-13 12:32:46 -06:00
Steve Harris
e242b041ad 14.1.1-13 baseline
Former-commit-id: a2ae393ec1 [formerly 85eebac7e2] [formerly c88b10039a] [formerly a2ae393ec1 [formerly 85eebac7e2] [formerly c88b10039a] [formerly b0b55a676b [formerly c88b10039a [formerly 6eef3022653638f9031a85932d8d551aba5600d2]]]]
Former-commit-id: b0b55a676b
Former-commit-id: 690b177ded [formerly 5368f23247] [formerly afbe4db73cf4d0b084a0f0de6518f4b936da3cee [formerly 61d4adc979]]
Former-commit-id: 0ea21b66b82286c758014c97bc2a1696ff006efb [formerly ff08301890]
Former-commit-id: 800136d61b
2013-12-12 16:59:57 -05:00
Richard Peter
f1f766f028 Issue #2170: Add registration of Router to Notification Framework
Change-Id: Ib2bc29d82395a021cee3a8f98b894010303f06ad

Former-commit-id: 6b2c2ac57c [formerly db0e9d40ec] [formerly 312fcc2b2f] [formerly 6b2c2ac57c [formerly db0e9d40ec] [formerly 312fcc2b2f] [formerly ded9c782fc [formerly 312fcc2b2f [formerly 6ea46281b904c99c9b6c9f364293bec96be16f7d]]]]
Former-commit-id: ded9c782fc
Former-commit-id: c137c98511 [formerly 3b4507cbe5] [formerly 8c2b99ce5979cc67fe016129fe2f3a8f2ec3736d [formerly b4fc76c03a]]
Former-commit-id: 302828b82ac098e1033aa3ca4d42c0d128d7f76b [formerly 3543625506]
Former-commit-id: d357b534c4
2013-12-12 13:47:37 -06:00
Ben Steffensmeier
c41c64ce5b Issue #2619 Fix rare dateline bug.
Former-commit-id: 1b99b5aca0 [formerly 45e4b4bbad] [formerly 399c579671] [formerly 1b99b5aca0 [formerly 45e4b4bbad] [formerly 399c579671] [formerly 607b5edb69 [formerly 399c579671 [formerly 8231fde4fdcb25ad19e31dd8e4f5716becba347c]]]]
Former-commit-id: 607b5edb69
Former-commit-id: 6a35407957 [formerly 58dabbfc87] [formerly fc52d111900f81c3257ff7f1b3c079e152fb00d3 [formerly d0f4b18b78]]
Former-commit-id: 9fc0459f3f576463d2cc040689f06ba824bcec45 [formerly a92f15a8fa]
Former-commit-id: 463ad8e8fa
2013-12-12 10:30:22 -06:00
Richard Peter
b53a3d614d Merge "Issue #2613 Fixed build" into omaha_14.2.1
Former-commit-id: 920fc0cd6c [formerly 55047d6807] [formerly ffab0f1669] [formerly 920fc0cd6c [formerly 55047d6807] [formerly ffab0f1669] [formerly 2f2f755110 [formerly ffab0f1669 [formerly c1630accf918363334c4d558cda8810341d0a2b7]]]]
Former-commit-id: 2f2f755110
Former-commit-id: 0980aa3328 [formerly 875d6570ee] [formerly 1381038e1b08db21600d309ac1f9900e2fe8c78c [formerly 4e5cd81df9]]
Former-commit-id: 94e446c096c620d0acfcf833214d1bbe8195b8ff [formerly d0fbf8df6b]
Former-commit-id: 455dfbcdeb
2013-12-12 09:54:19 -06:00
Benjamin Phillippe
07f1ed1f1f Issue #2613 Fixed build
Change-Id: I699c50d3404d155d6435c2ff4f33a465cfd96d14

Former-commit-id: edc39cafac [formerly 5f3e8a5436] [formerly 7529f5bbe8] [formerly edc39cafac [formerly 5f3e8a5436] [formerly 7529f5bbe8] [formerly 2e909bc207 [formerly 7529f5bbe8 [formerly ce2bffa120b722cb3337658584a83c5161f07a51]]]]
Former-commit-id: 2e909bc207
Former-commit-id: 9d3c42381b [formerly 60d141c6a4] [formerly 68b4e030b4ac73f474d7331cc758905d41a0b7bd [formerly 620e838f59]]
Former-commit-id: 8e3c7c8114bf3e467630c9e645018bf27bf516c8 [formerly b960d13fd8]
Former-commit-id: e54629a36e
2013-12-12 09:44:05 -06:00
Richard Peter
12480dba1b Merge "Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations." into omaha_14.2.1
Former-commit-id: 71d88ca431 [formerly 247eb683e5] [formerly 91dc7825ce] [formerly 71d88ca431 [formerly 247eb683e5] [formerly 91dc7825ce] [formerly 3cc5ebc43e [formerly 91dc7825ce [formerly 08a46b28d5fb5f2e5d28a5f4138ee4fea3fad05d]]]]
Former-commit-id: 3cc5ebc43e
Former-commit-id: 8c0e800811 [formerly 7462693157] [formerly f3be58dab7723ab7f480a5a91a797293f8455ece [formerly 74c73c8ee1]]
Former-commit-id: f8fe8fd85b932bf64f73a4388d51efc7bd03ebdd [formerly e4af4c8b58]
Former-commit-id: ff074484f5
2013-12-11 18:00:10 -06:00
Richard Peter
24acb66362 Merge "Issue #2625 - fix no data errors in bandwidth utilization graph remove datauri from RetrievalGeneratorUtilities Set queries for DPA data to query by insertTime rather than obsTime" into omaha_14.2.1
Former-commit-id: d4b5572775 [formerly e41adf1ee9] [formerly 49def8a4b2] [formerly d4b5572775 [formerly e41adf1ee9] [formerly 49def8a4b2] [formerly a0f59f2059 [formerly 49def8a4b2 [formerly 4da283cae33cca8264007e246fa3d02b9809a114]]]]
Former-commit-id: a0f59f2059
Former-commit-id: 1a34cd0d66 [formerly 9a02a5cf39] [formerly 16027467a25225e85df14eb9f42c3327ad009c45 [formerly 7673b97152]]
Former-commit-id: 5aadb339fb8aa618706a52f13beb01fb1a34c3fc [formerly 022ee8929e]
Former-commit-id: 59ee3a6432
2013-12-11 17:59:43 -06:00
Brad Gonzales
fdcc2662ed Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations.
Change-Id: Ie9eb7e3e1a5bc8ac4a8ccf9532686d97f584bf1c

Former-commit-id: 1c027db49b [formerly 6515d6a9e5] [formerly 112649eff2] [formerly 1c027db49b [formerly 6515d6a9e5] [formerly 112649eff2] [formerly 96dc3b65b1 [formerly 112649eff2 [formerly 14171c13dd5f127df0b90a5db9a9e11b301ffc5f]]]]
Former-commit-id: 96dc3b65b1
Former-commit-id: d81e245314 [formerly 3f5c25ff46] [formerly 0737955a8aef371ea08edc7e3c56b368da7ef030 [formerly 79efc3b53a]]
Former-commit-id: e67bd70c6a9e5e09b6487895962e3b3c7f1b2bd3 [formerly 133918fba6]
Former-commit-id: 7d479d8a73
2013-12-11 17:06:41 -06:00
Richard Peter
149de2e415 Merge "Issue #2616 - Set overwrite allowed flag on madis records when decoded Added delta script for table MADIS with the hibernate generated key name" into omaha_14.2.1
Former-commit-id: ce63ee408b [formerly f278dad7cc] [formerly 63bd2b26eb] [formerly ce63ee408b [formerly f278dad7cc] [formerly 63bd2b26eb] [formerly 6f57e14406 [formerly 63bd2b26eb [formerly 3d887a288459b786718a59d0c4a368408c3419f0]]]]
Former-commit-id: 6f57e14406
Former-commit-id: eb2ae25b0b [formerly cdf86e65ec] [formerly 4d3fe53b50bbff6dffd235bf492f67ac729eea24 [formerly 2f0e43e5a4]]
Former-commit-id: f379b9c9ae210f65afd2682f70d34ca47614b7cd [formerly fb3ccd066c]
Former-commit-id: b3074e9215
2013-12-11 16:19:02 -06:00
Richard Peter
83b09c235b Merge "Issue #2613 Registry performance enhancements" into omaha_14.2.1
Former-commit-id: cfd32aee5f [formerly 4ec080e015] [formerly 375c532376] [formerly cfd32aee5f [formerly 4ec080e015] [formerly 375c532376] [formerly 0ed2ba8024 [formerly 375c532376 [formerly 6a3b2d31829b4f6d39a6a06ec06c901b58506deb]]]]
Former-commit-id: 0ed2ba8024
Former-commit-id: 34f55d6132 [formerly 1d339f16f5] [formerly 19bf66da69dde6bc681fece6d897e713df539fe5 [formerly 890f038a54]]
Former-commit-id: d944181e0a14ef777ae04ff9a150e269cd897968 [formerly 1c5dc1b952]
Former-commit-id: ff66c6d1e5
2013-12-11 16:11:26 -06:00
Richard Peter
b4bd7c9ff3 Merge "Issue #2566 fix bandwidthmanager spring file resource resolution." into omaha_14.2.1
Former-commit-id: 02e6e33eb8 [formerly d720fbbd63] [formerly d9d19a1515] [formerly 02e6e33eb8 [formerly d720fbbd63] [formerly d9d19a1515] [formerly 51e46e08c5 [formerly d9d19a1515 [formerly 4ea822a22d2b21b4b3172a1f93773f01c2af20de]]]]
Former-commit-id: 51e46e08c5
Former-commit-id: c2bb4039df [formerly 6dbcd6677c] [formerly ff7f24a830fce1b40cd26b8492b11dff33299fce [formerly 561706ef1e]]
Former-commit-id: 3ef0067379aabb11f9bde11ad38fdeddcb7ca970 [formerly 7788a51f89]
Former-commit-id: 333ee2bbab
2013-12-11 16:08:06 -06:00
Jonathan Sanchez
fa754ed7f8 Issue #2604 Refactored portions util out of viz.warngen.
Change-Id: I58fad25e0a53d34b3369d6b6463f29e753cb6d10

Former-commit-id: 966f814d2d [formerly 9878c3a797] [formerly 125e747fc9] [formerly 966f814d2d [formerly 9878c3a797] [formerly 125e747fc9] [formerly 2ecfe79516 [formerly 125e747fc9 [formerly ae9f22dbfce191c79e170b242bfc0c905b61e9bf]]]]
Former-commit-id: 2ecfe79516
Former-commit-id: bef733bb8f [formerly 45903c0e7d] [formerly 77df683bd7320416ea169ad18d4f073fee509742 [formerly 5796d108c3]]
Former-commit-id: 1f72fc394c40567d447019e17db68c0f5a4b80af [formerly a2e5cdeae5]
Former-commit-id: cb03686dc8
2013-12-11 14:59:16 -06:00
Mike Duff
0275c2b3a3 Issue #2616 - Set overwrite allowed flag on madis records when decoded
Added delta script for table MADIS with the hibernate generated key name

Change-Id: Id8cfee5bfba68aa686b9d998bdbf85e5de5c7519

Former-commit-id: fa87393135 [formerly 1a0893d70e] [formerly 9a02ae7d68] [formerly fa87393135 [formerly 1a0893d70e] [formerly 9a02ae7d68] [formerly 5a42580c2b [formerly 9a02ae7d68 [formerly b3a18fd5270f2ce109b0560fba6e11e76e721bc9]]]]
Former-commit-id: 5a42580c2b
Former-commit-id: 1504d28ac8 [formerly d65b7c1cf5] [formerly 66d528190928112341ed3f56645df5e6a90b4a1e [formerly dc6ab027b5]]
Former-commit-id: 9180a12adb33997ae9fb803dd7ecab5a82c85206 [formerly 3f98d329c9]
Former-commit-id: 00e00796ae
2013-12-11 14:12:05 -06:00
Benjamin Phillippe
c32d76ff6b Issue #2613 Registry performance enhancements
Change-Id: Id50678b2af78adff17fe622201a65d5530e68c21

Former-commit-id: fd4e9edb76 [formerly b2c565c173] [formerly 969099d4c4] [formerly fd4e9edb76 [formerly b2c565c173] [formerly 969099d4c4] [formerly 0cb4e61261 [formerly 969099d4c4 [formerly 8d62013d772cf3a15b8f0fa2be7d80955dbfd74d]]]]
Former-commit-id: 0cb4e61261
Former-commit-id: d794e8efed [formerly bfa17652ff] [formerly a1014b45f1af11aad2b8627651760da5407df827 [formerly 0d98a48d18]]
Former-commit-id: 4f6bf9cb8f0c4217f987b0987b2c31a8fd57917a [formerly 61b206a82e]
Former-commit-id: c330390a76
2013-12-11 12:20:12 -06:00
Mike Duff
09eea3fe55 Issue #2625 - fix no data errors in bandwidth utilization graph
remove datauri from RetrievalGeneratorUtilities
Set queries for DPA data to query by insertTime rather than obsTime

Change-Id: I67a55ca6898a5f478456d75c9ffd7e24120cade7

Former-commit-id: 9f5cf8e0c8 [formerly 4073f048d2] [formerly d378d9194a] [formerly 9f5cf8e0c8 [formerly 4073f048d2] [formerly d378d9194a] [formerly 3492436907 [formerly d378d9194a [formerly 9e37fa3a052d49830b36e6187280615cb6517d47]]]]
Former-commit-id: 3492436907
Former-commit-id: 4e87904b6f [formerly d83734f883] [formerly 286bba28a76b2a963357edfe7cede7d5247d6b31 [formerly bed189cc7b]]
Former-commit-id: 3f273a6d112f5458e37022b7314bbe06a7470d5e [formerly 35def598bd]
Former-commit-id: 671e43a228
2013-12-11 11:29:38 -06:00
Brad Gonzales
77b9816a0a Issue #2566 fix bandwidthmanager spring file resource resolution.
Change-Id: I533b39782454083411c65c3a1f721ca26a0d9731

Former-commit-id: 31930d262d [formerly 419230d6db] [formerly 5dd466e22a] [formerly 31930d262d [formerly 419230d6db] [formerly 5dd466e22a] [formerly cfa7128be2 [formerly 5dd466e22a [formerly c12676830e66cf8e18f10e835c0f95e25074d992]]]]
Former-commit-id: cfa7128be2
Former-commit-id: 919cea89ce [formerly 71d6ef856a] [formerly 548da1be7aa44a46bdb6fe06ce610a6d4f4e0449 [formerly 531c598e3b]]
Former-commit-id: 3fd1bec52252bdbebc894c0ddae7167d46581eb4 [formerly dbd7f3cc37]
Former-commit-id: ee8cbe414c
2013-12-11 11:19:40 -06:00
Nate Jensen
74476aa385 Issue #2581 remove LSR dataURI column
Change-Id: I9d5ddc8346e6b9ac0ec56d09d50b6b19a5bc682f

Former-commit-id: 1d91d67a5b [formerly 6188356e72] [formerly fa674baf89] [formerly 1d91d67a5b [formerly 6188356e72] [formerly fa674baf89] [formerly e037c179fe [formerly fa674baf89 [formerly 88124207249673c3bf29915b6f6318bd2397ecd5]]]]
Former-commit-id: e037c179fe
Former-commit-id: 61e9833351 [formerly 4478983895] [formerly d4f63bdd454d528603209bfccf323090b3ffb746 [formerly 34c1af18a7]]
Former-commit-id: 7568cea11c2e09ab775871667eabd4d94ff75e40 [formerly b5450572f2]
Former-commit-id: e548e47239
2013-12-10 18:27:33 -06:00
Nate Jensen
3de02c9d72 Issue #2581 fix decoding of LSR freezing drizzle and latlon
Change-Id: Iec01ce82c1b3104e86a54cd9ec015d699d0703d5

Former-commit-id: 2dc27feedc [formerly c0c17822c2] [formerly 60d395b347] [formerly 2dc27feedc [formerly c0c17822c2] [formerly 60d395b347] [formerly 16b0650f67 [formerly 60d395b347 [formerly f7324d1e9ab164c553f5c62920292fb0487bfcfb]]]]
Former-commit-id: 16b0650f67
Former-commit-id: c1b164d114 [formerly c96678bb3a] [formerly f03b5f2093b96690ad913f932903aae572e64345 [formerly 36845b1c1d]]
Former-commit-id: e2f2b5d700557b8b61af8c4f3090891b7e0691e7 [formerly 6b9ef6eddd]
Former-commit-id: 34319cc97e
2013-12-10 10:10:11 -06:00
Richard Peter
b5973d803f Issue #2170: Fix Ensemble notifications
Change-Id: I48cdd8dad18f0e4866f2e150acb37c8f6ada139b

Former-commit-id: ed79e93d00 [formerly 0c5a6af2f3] [formerly b3f90b4e07] [formerly ed79e93d00 [formerly 0c5a6af2f3] [formerly b3f90b4e07] [formerly 0c269d0a7c [formerly b3f90b4e07 [formerly da7c2ba0cdc0e9108d987d9ff7531f657c7c832e]]]]
Former-commit-id: 0c269d0a7c
Former-commit-id: 799df90f7f [formerly 4a6d41871e] [formerly e8dec021bb4665162c922437e35f72eea5dd05e6 [formerly d430167b2c]]
Former-commit-id: 762a10da036e844868c06b6318a24b2ba933478c [formerly 3376002d20]
Former-commit-id: 5283e7c725
2013-12-06 15:41:10 -06:00
Brad Gonzales
d1fa8c738b Issue #2566 Refactored BandwidthManagerCreators to load spring files using Executor.extractSpringFiles.
Amend: Refactored Executor static modes specific methods into a EDEXModesUtil class in
       the edex.core.modes package.  Move EdexMode, DefaultEdexMode, and EdexModesContainer
       to the same package.

Change-Id: Ib6af9557ca8d875c5eff162b46bf56e2c041e0fb

Former-commit-id: 310597d856 [formerly 3d34764022] [formerly 410a00c72a] [formerly 310597d856 [formerly 3d34764022] [formerly 410a00c72a] [formerly 72df38075f [formerly 410a00c72a [formerly 76a844ed3158bcc80dc0d4b751cad83d39fcbbc4]]]]
Former-commit-id: 72df38075f
Former-commit-id: fa097589d0 [formerly e18f7b2380] [formerly d6d85c281b70c2e07827f44bc42368ab797e8062 [formerly c54fe467a3]]
Former-commit-id: e96fbe2c0a9f49c38dbe9b9eb76448f730afdb58 [formerly 3d592d0b38]
Former-commit-id: 143e160eae
2013-12-05 15:17:14 -06:00
Richard Peter
077ddd9818 Merge "Issue #2545 - Get bandwidth graph data by network" into development
Former-commit-id: da82396995 [formerly df4a4c5121] [formerly d0b50eee3c] [formerly da82396995 [formerly df4a4c5121] [formerly d0b50eee3c] [formerly 6fde307f0a [formerly d0b50eee3c [formerly a31695805478d27e072d069d5d3b369001c1d80d]]]]
Former-commit-id: 6fde307f0a
Former-commit-id: 3088533103 [formerly 45889cb80f] [formerly ab63c3e242c8f489c2b55d427b4ca49dfd7b4657 [formerly 9f4dfc9051]]
Former-commit-id: 714bcfc3b217ba5f4187ec79b31726d5a3bcf4c4 [formerly ef7ba1f1ee]
Former-commit-id: 8cde2b5e9d
2013-12-05 14:54:46 -06:00
Richard Peter
ba7c66948e Issue #2509: Fix bad merge of DupElimSrv
Change-Id: I72702e9943016cd6e00ecc8755222d8de31ee322

Former-commit-id: 3dd79852c5 [formerly 02f48f898f] [formerly 5286ef0efa] [formerly 3dd79852c5 [formerly 02f48f898f] [formerly 5286ef0efa] [formerly 01a8461ec9 [formerly 5286ef0efa [formerly a266d4007bdb58525942ef406d6fd7a4d269bb8c]]]]
Former-commit-id: 01a8461ec9
Former-commit-id: af583069c4 [formerly b91b4913c6] [formerly b77fed65aafbc3c1525e24ed1b2eabe0af90b127 [formerly 407fd38c5f]]
Former-commit-id: 5f8efd3491b29239d1ee302c99035252660d57d3 [formerly 7475486bf9]
Former-commit-id: 5744c6422c
2013-12-05 14:22:25 -06:00
Mike Duff
6bacb944fb Issue #2545 - Get bandwidth graph data by network
Change-Id: I4de455a4da43f180ff37eb72370addec77a29314

Former-commit-id: c7345582e9 [formerly a412a19583] [formerly 4796f43495] [formerly c7345582e9 [formerly a412a19583] [formerly 4796f43495] [formerly 0c452e2434 [formerly 4796f43495 [formerly 9102f16c8a6409e92ded498b82a6a4e6a531f2c0]]]]
Former-commit-id: 0c452e2434
Former-commit-id: 802e0d360c [formerly 45cf9384d8] [formerly 0a68403f743b2b5033d96fa1433b811164defb55 [formerly 7f2ddb1360]]
Former-commit-id: 6357394278816b4bba40d3a8336a9f549bcbbad8 [formerly d3c5ee0468]
Former-commit-id: 0885df1d3f
2013-12-05 13:35:31 -06:00
Richard Peter
cd6f139d06 Merge "Issue #1829 Refactored EBXML registry objects" into development
Former-commit-id: bf845a6f50 [formerly 0cfe359507] [formerly bacfa33301] [formerly bf845a6f50 [formerly 0cfe359507] [formerly bacfa33301] [formerly 88c866256e [formerly bacfa33301 [formerly 5f1736746f7594ba0bda3a48083a78ff5ec8d2c9]]]]
Former-commit-id: 88c866256e
Former-commit-id: 7b222f8982 [formerly ba1bd01bca] [formerly d13b14c1956ab859e5db6a8f3904659a9ce48a78 [formerly 9e64f22e8b]]
Former-commit-id: e215fac20b023c853044712a724bbf1d7f6f493f [formerly b8e4812182]
Former-commit-id: 8e1984e6ed
2013-12-05 13:01:02 -06:00
Nate Jensen
88dba55224 Merge "Issue #2574 Add spring dependency on gridcoverageLookup for scanGenerator." into development
Former-commit-id: 70667c9edc [formerly 178b2bc3fa] [formerly 34205de815] [formerly 70667c9edc [formerly 178b2bc3fa] [formerly 34205de815] [formerly db25d00dc5 [formerly 34205de815 [formerly 18437fb36f9fff510f526ba40b52c4ec4793e18b]]]]
Former-commit-id: db25d00dc5
Former-commit-id: b838267dfc [formerly 8b4f6873a0] [formerly 75746ca49730ca540e2a30e1645ceb7d3dc5b58b [formerly 280325460f]]
Former-commit-id: 00ab4bdcb1b88ea20092d07c85b260d4c24a1461 [formerly a1ff972ae6]
Former-commit-id: ecdbb80086
2013-12-05 13:00:06 -06:00
Nate Jensen
200183a10b Merge "Issue #2537 Use PointDataAccessFactory for multiple point data types. Change-Id: I655091f116cde662933ed96d926372a14a435dfc" into development
Former-commit-id: 65e20edacf [formerly b16c88133b] [formerly c47f6546dd] [formerly 65e20edacf [formerly b16c88133b] [formerly c47f6546dd] [formerly ae0bd2a86f [formerly c47f6546dd [formerly 648e5bff2e85d00cf5bcee923f2a137aa76117fc]]]]
Former-commit-id: ae0bd2a86f
Former-commit-id: ad2b7df40b [formerly 15fee953f5] [formerly e0720d869c55d2c9da519b9b077f3fd06f02207e [formerly 7163e28d35]]
Former-commit-id: 8d7ad4d8fd6c5d67b7d5e36dddea37c59b03c830 [formerly bd4e9158f0]
Former-commit-id: 9740b5349b
2013-12-05 12:59:58 -06:00
Richard Peter
a9fca155ac Issue #2509: Fix IFPWE merge issue
Change-Id: Ic2a675228f066302eba10e52ba61ea62ab411d75

Former-commit-id: 98d1934501 [formerly 5ad19e32a9] [formerly 73960ce29a] [formerly 98d1934501 [formerly 5ad19e32a9] [formerly 73960ce29a] [formerly a8b251223a [formerly 73960ce29a [formerly 9450ca459d6b2efdea0d0124a6f9e7100eb5472a]]]]
Former-commit-id: a8b251223a
Former-commit-id: 405274c409 [formerly f473851db8] [formerly 353ea204d786797b9a8d11a6fa8df1eaa4fe8faa [formerly 7bcdabd8dd]]
Former-commit-id: 6c14189c557acf3e1b8a1b3e6050994837f87b02 [formerly c909291e15]
Former-commit-id: 20b1c9cfbc
2013-12-05 12:33:51 -06:00
Richard Peter
f362062048 Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
	edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs

Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a

Former-commit-id: ba577ff354 [formerly b3b23647b4] [formerly 0c4ae068ad] [formerly ba577ff354 [formerly b3b23647b4] [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 530b3bd588 [formerly 60679a818a] [formerly a031ba53197c00cc0956c78c19bfb9d661fb4215 [formerly da027298d4]]
Former-commit-id: 53e9784af497b834229cb70070f6499791f6f567 [formerly fd93b7d85e]
Former-commit-id: ae6e34be4b
2013-12-05 12:12:27 -06:00
Ben Steffensmeier
9afbf8737a Issue #2574 Add spring dependency on gridcoverageLookup for scanGenerator.
Former-commit-id: 8746c75023 [formerly 9036774493] [formerly a567f2af89] [formerly 8746c75023 [formerly 9036774493] [formerly a567f2af89] [formerly 3d2439dc31 [formerly a567f2af89 [formerly fb354f5242a3eac4bf3d3c35efef78ed7a7e01f4]]]]
Former-commit-id: 3d2439dc31
Former-commit-id: 8ca3c352c6 [formerly d1cfb7f9d5] [formerly 10d58850c6a7d67b077c8a2f260784bc567fdc56 [formerly a5001016c9]]
Former-commit-id: c167d318348112adecb62fdca3c42916f9750ba0 [formerly c3aa830346]
Former-commit-id: bff909c157
2013-12-05 11:27:29 -06:00
Ben Steffensmeier
84825d1841 Issue #2537 Use PointDataAccessFactory for multiple point data types.
Change-Id: I655091f116cde662933ed96d926372a14a435dfc

Former-commit-id: 318e48c945 [formerly 7c2a4ef72c] [formerly f682e66e9b] [formerly 318e48c945 [formerly 7c2a4ef72c] [formerly f682e66e9b] [formerly 46a466497c [formerly f682e66e9b [formerly 91a3fdbc8bd98603a1cda218729d5542dac809ef]]]]
Former-commit-id: 46a466497c
Former-commit-id: 6ebc4e5fbc [formerly fde968a834] [formerly a3846ce22f8e198d3cc7cd225b88e3fcecf8d9a7 [formerly ad9fee446d]]
Former-commit-id: 127df8be9a4be1f882d7db4b5b59fec0343ae2c3 [formerly 956e8b04f2]
Former-commit-id: 2eb9a45951
2013-12-05 10:54:28 -06:00
Benjamin Phillippe
05697b7d21 Issue #1829 Refactored EBXML registry objects
Change-Id: I0f1b2ecbac19cdc2304680d4dbdfb5d963f0649d

Former-commit-id: da4f658b7a [formerly ed890ce9d9] [formerly 0b0e70b667] [formerly da4f658b7a [formerly ed890ce9d9] [formerly 0b0e70b667] [formerly ed77440c28 [formerly 0b0e70b667 [formerly 6eb387e69c2fc4837b58f99e4343a745162fb384]]]]
Former-commit-id: ed77440c28
Former-commit-id: 2165a9059a [formerly 7051d10140] [formerly 30d36d7bd29ad367d12eab6b8c4f863628e42d08 [formerly 7ed6195536]]
Former-commit-id: e1c980933ce90b17acef2e071f802300ba5224f4 [formerly 3d7c473241]
Former-commit-id: 8c1e55db1f
2013-12-05 10:20:24 -06:00
Ron Anderson
d3d2ea3745 Issue #2331 Fixed Topo retrieval for smartTools/procedures
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3

Former-commit-id: 218a052bbf [formerly 497236ca74] [formerly b5906249cc] [formerly 218a052bbf [formerly 497236ca74] [formerly b5906249cc] [formerly 20eeb2796e [formerly b5906249cc [formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]]]]
Former-commit-id: 20eeb2796e
Former-commit-id: fb3b7b0a9f [formerly e30d6041ee] [formerly 473bec12d3fe432d141080f1a78bde66bd1ac17b [formerly 103fed386f]]
Former-commit-id: 89e88491b334d8f079138c920fd456262fa46656 [formerly 89e87a1683]
Former-commit-id: bbd7ea36a1
2013-12-04 17:10:48 -06:00
Steve Harris
31c94115c7 14.1.1-12 baseline
Former-commit-id: f53eb87892 [formerly 371d1ca63c] [formerly b24d9c80b0] [formerly f53eb87892 [formerly 371d1ca63c] [formerly b24d9c80b0] [formerly a3ec45a99f [formerly b24d9c80b0 [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]]
Former-commit-id: a3ec45a99f
Former-commit-id: 1e4b2bac7b [formerly 4e6f319422] [formerly 78fc95a6e82a286a422cf62a1c8adc867f7438c4 [formerly 14421048af]]
Former-commit-id: e177b16a88af27dc0abf4496fe58fbe454cfa8c9 [formerly 234ca267ed]
Former-commit-id: 60f062ea59
2013-12-04 16:47:59 -05:00
Richard Peter
956a39cf72 Merge "Issue #1736 Add registry bandwidth tracking Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6" into development
Former-commit-id: 2a2473f3bb [formerly ff44393e90] [formerly ea7dac5993] [formerly 2a2473f3bb [formerly ff44393e90] [formerly ea7dac5993] [formerly 0281447166 [formerly ea7dac5993 [formerly 2cef3f9742ac0dcff0e9d90507abc30714e8548f]]]]
Former-commit-id: 0281447166
Former-commit-id: 8f9b6fa07c [formerly d937861d05] [formerly f8b518f19e6bc75858971de994088a9caa63f0de [formerly f6808e6623]]
Former-commit-id: c7aa9d937c01012c67dfbd64e95131561967b13e [formerly 8cdd151d64]
Former-commit-id: 54c056a310
2013-12-04 12:00:40 -06:00