xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5497 commits 31 branches 40 tags 3.8 GiB
Commit graph

2513 commits

Author SHA1 Message Date
Richard Peter
90f3b627af Merge "Issue #2678 end retrieval double clutching Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc" into omaha_14.2.1 
Former-commit-id: 4d5c7e49f9 [formerly e981ce3e36] [formerly 18234c5d73] [formerly f59d1433db [formerly 18234c5d73 [formerly 555358125bfb925a2c8ed0d393911b4d045d18b1]]]
Former-commit-id: f59d1433db
Former-commit-id: 5f03de8c59b4bb9535d972f40d6cc693c365c3da [formerly 76f15c73dd]
Former-commit-id: cc35481b48
 2014-03-11 16:43:37 -05:00
Dave Hladky
39cc47bc52 Issue #2678 end retrieval double clutching 
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc

Former-commit-id: b440063bb9 [formerly 7cd4304140] [formerly 3500ad262a] [formerly 76e216d319 [formerly 3500ad262a [formerly 31a35e35b75bc9e6efc43af1da0b184c1828ff45]]]
Former-commit-id: 76e216d319
Former-commit-id: 28b9b16fdbb85a6e9a3afb5298b0813e917a59b1 [formerly 03fd32144a]
Former-commit-id: f3876233e4
 2014-03-11 15:53:59 -05:00
David Gillingham
6fcb5b7e73 Issue #2509: Fix static topo generation break caused by baseline merge. 
Change-Id: I4300af81de44639a6ac55b968f18730f698e3b68

Former-commit-id: 751d8956a9 [formerly e3a3cf7bad] [formerly b0783b64ce] [formerly 187196b519 [formerly b0783b64ce [formerly 09a2f9e3ccabc82cbea9556351bdc02bb1c350c7]]]
Former-commit-id: 187196b519
Former-commit-id: e949b41e8ce1e7c37f0f510cdbbac24e2438f30d [formerly 68edb8d9a1]
Former-commit-id: 4179172d0e
 2014-03-11 11:54:25 -05:00
Juliya Dynina
d1b202fcd0 Merge "ASM #349 - Workaround for QPID-5569" into asm_14.2.1 
Former-commit-id: 2b55a4240e [formerly b3ec4c363f] [formerly 6bbd88e62c] [formerly 7952862443 [formerly 6bbd88e62c [formerly a167748b77baad66784893304a18e8866f5471f1]]]
Former-commit-id: 7952862443
Former-commit-id: 30b12a7237013355ab82100b5cd40d97cfd766da [formerly 7e35f36651]
Former-commit-id: bedc9082b0
 2014-03-11 09:24:12 -05:00
Ron Anderson
c8ecb9a934 Merge "Issue #2721 Fix error when activeSites.txt contains blank lines." into development 
Former-commit-id: 116826d0f8 [formerly bd57a18a29] [formerly 6b51b05bdf] [formerly f3a6acaf48 [formerly 6b51b05bdf [formerly e665fa251dab6afb16d5a3863aac0815e84a00d4]]]
Former-commit-id: f3a6acaf48
Former-commit-id: fb4aba70507fc50b99a5a3d974471405f7dc99ef [formerly 7b272e271c]
Former-commit-id: d6d544bc3b
 2014-03-10 18:07:17 -05:00
Ron Anderson
e4bd652ae8 Issue #2721 Fix error when activeSites.txt contains blank lines. 
Change-Id: I76b9b21134907f5297bae5fb106334ed54f5b6ac

Former-commit-id: 2cb4512201 [formerly 3cf3a9e70c] [formerly 3af33de29b] [formerly aa62ab0fd8 [formerly 3af33de29b [formerly d711aa3552e660aba1ac885c0767bab8c856da54]]]
Former-commit-id: aa62ab0fd8
Former-commit-id: 4dd4c15e50b8d3523dd154efcc30466d01cd4070 [formerly 7621944608]
Former-commit-id: 507d8a63f8
 2014-03-10 17:57:43 -05:00
Ron Anderson
52053c561d Merge "Issue #2824 Fix null at end of validation message." into development 
Former-commit-id: 7525a8e0db [formerly bf7a958302] [formerly f7f49ef1cb] [formerly 199b6eb3fd [formerly f7f49ef1cb [formerly 2b79c54340f7a2bb9492435117db77bb9c6d01a3]]]
Former-commit-id: 199b6eb3fd
Former-commit-id: a18b650f52c9d3a5dfddfb3b77ecd007f4076c30 [formerly fb5036b1d4]
Former-commit-id: bc0d3ca667
 2014-03-10 17:54:51 -05:00
Ron Anderson
c30e9abcb6 Issue #2824 Fix null at end of validation message. 
Change-Id: Ifdf54cabf0b3bc44e7492c8a4d8a5f1969e4daa1

Former-commit-id: f4f807d03b [formerly 61148935cf] [formerly ac39b1accb] [formerly f0294a3ff8 [formerly ac39b1accb [formerly 24ae011033b851364e4c6efe98488c4066cfd042]]]
Former-commit-id: f0294a3ff8
Former-commit-id: d1cf1221c983278d85a6b32924946a49f715a34f [formerly b3b6d93b4c]
Former-commit-id: f2f1f95863
 2014-03-10 17:42:55 -05:00
brian.dyke
41a37605d4 Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1 
Former-commit-id: 730491d4bb [formerly 1a482f91bc] [formerly 654778bb0d] [formerly b1b216f196 [formerly 654778bb0d [formerly 9dba33a7122e20c0502b2bf8036ec875e957798b]]]
Former-commit-id: b1b216f196
Former-commit-id: 9bef04b7d89a16100ee76d159ab4225ead55540a [formerly d57a3dd24c]
Former-commit-id: d1b389ae05
 2014-03-10 15:36:56 -04:00
Ben Steffensmeier
451db7a75e Issue #2673 Fix name of lighning data factory. 
Former-commit-id: a410e3457f [formerly 89eeb243ec] [formerly 019cf9c943] [formerly bd7d250cec [formerly 019cf9c943 [formerly 86e3270b88336978cfa799fae402aa350b6dcac2]]]
Former-commit-id: bd7d250cec
Former-commit-id: 68fb71573c7e3fdcf136433cfbecbd7de8b1ba2f [formerly abad6524ed]
Former-commit-id: 93b5fba876
 2014-03-10 13:35:34 -05:00
Richard Peter
b4ba4a09a8 Merge "Issue #2876 - removed import, changed jave version to 1.6" into development 
Former-commit-id: a15f5014c2 [formerly 9585896021] [formerly 6581f2b3f4] [formerly 7a2409f488 [formerly 6581f2b3f4 [formerly 61e13e5e81ee25d4c0be9c80b4e6970f4cf0f3e6]]]
Former-commit-id: 7a2409f488
Former-commit-id: c9eae74dc848935632ab8e6aacd8bcc302bd4544 [formerly 92568811c7]
Former-commit-id: 505b86cf19
 2014-03-10 12:53:15 -05:00
Mike Duff
02f0968a60 Issue #2876 - removed import, changed jave version to 1.6 
Change-Id: Ia2806bff0b7042983c6dd7498c76a66c8c277a29

Former-commit-id: 794e7664ab [formerly f6db852657] [formerly 63b9452c3f] [formerly 419293a946 [formerly 63b9452c3f [formerly 8ce84ce824a852ad08e70fd272d2bc62b02ef292]]]
Former-commit-id: 419293a946
Former-commit-id: 0c212599d733659589b767682b3edd6367ff8a62 [formerly 60dd115d66]
Former-commit-id: e005e6fb55
 2014-03-10 12:49:27 -05:00
Lee Venable
8575254b94 Merge "Issue #2807. Added MalformedDataException for VAA decoding." into development 
Former-commit-id: a187f1b3d6 [formerly 57d2e9737a] [formerly f9d019f0dc] [formerly 9bf99b9359 [formerly f9d019f0dc [formerly 4094bd9c9eb40db9a93e679bb09fba1bea1d8639]]]
Former-commit-id: 9bf99b9359
Former-commit-id: 5ddb0c9717c0c611a2a746f1905d4f9f59de868d [formerly 9e9bb11b5f]
Former-commit-id: 20efe51651
 2014-03-10 11:52:25 -05:00
Nate Jensen
5ff614276d Merge "Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter." into development 
Former-commit-id: 9f70b30551 [formerly 60bff5c4af] [formerly 4c7bda09c0] [formerly 33d1e94c38 [formerly 4c7bda09c0 [formerly 99c2f252cab0901cedfefa5e2a6d6799f7e29db8]]]
Former-commit-id: 33d1e94c38
Former-commit-id: 0934d226d319cbf0db5b7c24ab420cd99f84cb70 [formerly f045d2fab0]
Former-commit-id: ee1efad5d7
 2014-03-10 11:36:16 -05:00
Slav Korolev
eff2290cf3 Issue #2807. Added MalformedDataException for VAA decoding. 
Former-commit-id: f721d8bd64 [formerly 4a3a56abe6] [formerly 8391b1098e] [formerly 8f8a6cb90e [formerly 8391b1098e [formerly 085c10211b1fa397ca54b8d4d316055f9225db0c]]]
Former-commit-id: 8f8a6cb90e
Former-commit-id: 54de7c7518a4017232458897aec277a7df8762f4 [formerly 1f8d00e033]
Former-commit-id: d1fbf15b5d
 2014-03-10 12:31:57 -04:00
Nate Jensen
fdb04e7b8c Merge "Issue #2876 - move NDM plugin feature entry." into development 
Former-commit-id: 63ca4e4cf8 [formerly 9026f93f20] [formerly c247535b96] [formerly 14e4807c02 [formerly c247535b96 [formerly 1a5d1cab01d14d0fef04046beb5737ed2c3d2e88]]]
Former-commit-id: 14e4807c02
Former-commit-id: 681ab5fd62e32acfb6ad0f21394c1bf87a87d68d [formerly 9dac73c948]
Former-commit-id: 3a66c42d37
 2014-03-10 09:49:28 -05:00
Mike Duff
d6e478f73e Issue #2876 - move NDM plugin feature entry. 
Change-Id: I3a0bc2b0deeaf565215cec588d71b177ef6a456f

Former-commit-id: 5c2d6189b4 [formerly bcd4b1490d] [formerly 6be6181108] [formerly 2fc712e1e8 [formerly 6be6181108 [formerly a3b334c9269a9753af0f2dd9f6507aef23177b9f]]]
Former-commit-id: 2fc712e1e8
Former-commit-id: 2cb3c387db5cc599a7efd039cccde7a292e38fbd [formerly 861013ad86]
Former-commit-id: 1eefba01ab
 2014-03-10 09:45:04 -05:00
Ben Steffensmeier
bf5b777b0d Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter. 
Former-commit-id: 094086b5c2 [formerly c0b478eb97] [formerly 9122b6da99] [formerly 8650074737 [formerly 9122b6da99 [formerly ba5ff870337c7ac66d633077d84de867e5df967c]]]
Former-commit-id: 8650074737
Former-commit-id: b86eb15482eef7c6ed811b7be5a9d782dbcfa838 [formerly d3043fda5a]
Former-commit-id: 5e4c35e93f
 2014-03-07 18:15:32 -06:00
Steve Harris
edeb1833ae Merge branch 'omaha_14.2.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml

Former-commit-id: 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]
Former-commit-id: f60aba35d6
Former-commit-id: dd4a41540248d59f726530a16fc9cba204845e67 [formerly 708485427e]
Former-commit-id: c24108e75b
 2014-03-07 15:43:40 -06:00
Mike Duff
99856b46c8 Issue #2876 - Fix manifest file. 
Change-Id: If02046664c5d60f2f3c30cbf7f502189eb5874f9

Former-commit-id: 1f70eb6704 [formerly 6ace7b364d] [formerly 618dbec585] [formerly 4cefac4658 [formerly 618dbec585 [formerly 934b0c91d8f2bb8625aaae7851e4f0202e5b1f48]]]
Former-commit-id: 4cefac4658
Former-commit-id: 8710e01797310f59f4253ee7a08be657a5ac9551 [formerly 9051daf05f]
Former-commit-id: 1d2fd0a6d2
 2014-03-07 15:41:24 -06:00
Steve Harris
a94f800324 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly 40b543f9a8 [formerly 92232fa063 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]
Former-commit-id: 40b543f9a8
Former-commit-id: b74d7aa4530a565aa9b8f8596b6981c8ead91adb [formerly f992a6b046]
Former-commit-id: 4d1fbf8743
 2014-03-07 15:16:18 -06:00
Shawn.Hooper
1acdbf20f2 ASM #224 - WarnGen: OB13.5.2 Template Errors 
Change-Id: I68e8942e90fb62388b2c400f6a54f3de1a3f1c28

Former-commit-id: bd02f6a1a6 [formerly e894b1279a] [formerly 41a4905f9f] [formerly 56a949fba8 [formerly 41a4905f9f [formerly b18b8f64040b1c41810f391b8ed785327b6e5d59]]]
Former-commit-id: 56a949fba8
Former-commit-id: 8e558f4668f969675b3426aa8d9a1fd8674746ec [formerly aa827610b1]
Former-commit-id: 84b71d7252
 2014-03-07 14:53:54 -05:00
Richard Peter
d5fc2e46fb Merge "Issue #2876 - Pluginize NDM review comments" into development 
Former-commit-id: 476e85b564 [formerly 946c8fcf24] [formerly 4568108a3c] [formerly c9dfa75d1c [formerly 4568108a3c [formerly 296f8f835cbc87783f0f50278d2148f756cf6296]]]
Former-commit-id: c9dfa75d1c
Former-commit-id: 682620b034ca0c7daf92bbb376a4be5ccc829728 [formerly 29250be003]
Former-commit-id: 6845ca74b3
 2014-03-07 13:04:14 -06:00
Mike Duff
a8714addc5 Issue #2876 - Pluginize NDM 
review comments

Change-Id: I9911c531a0e2ac735df949cc3f9aa72dc192483d

Former-commit-id: 63937fa7cd [formerly 7fd9cc40c7] [formerly 944fca16b8] [formerly c388cb839b [formerly 944fca16b8 [formerly 2f1aa28a4389c15e20724ebc8d79501c338f565e]]]
Former-commit-id: c388cb839b
Former-commit-id: 9aea84fb4bf8ca5374b8bd4488c02898ee308de8 [formerly 7bb9ada00d]
Former-commit-id: 12ea05cffc
 2014-03-07 12:47:46 -06:00
David Friedman
951bd668ae ASM #349 - Workaround for QPID-5569 
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce

Former-commit-id: b8aadf1781 [formerly 103fece7b7] [formerly 2c1a3442d6] [formerly a58f3cb7df [formerly 2c1a3442d6 [formerly 18d692c17ea11537d0eb832fbe63a04b59b0040c]]]
Former-commit-id: a58f3cb7df
Former-commit-id: 38bf85175bedb3976ea85ab928e8bdea8f6e4a64 [formerly 2a4a92c223]
Former-commit-id: 91b22ff9bb
 2014-03-07 14:58:09 +00:00
Steve Harris
3f778f9f9f Merge branch 'omaha_14.2.1' into development (from 14.2.1-9) 
Former-commit-id: 08dbf1f7ea [formerly dc7d6ceced] [formerly 8b6263bfbd] [formerly 1c64a5c025 [formerly 8b6263bfbd [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]]]
Former-commit-id: 1c64a5c025
Former-commit-id: ce9b772480f62374b4f578a3aa3691569ae98b58 [formerly 7fbbc1e118]
Former-commit-id: 972fa3bee6
 2014-03-06 18:31:10 -06:00
Brad Gonzales
5fae9e6577 Issue #2885 Update PDE build to Java 1.7. Fix code that is now an error in Java 1.7. 
Amend: changed to use set method.

Change-Id: I39cb36937fb9faafe24f2e87a897ae78c7c660e1

Former-commit-id: 770f675138 [formerly cb89c806c8] [formerly 08ee82c39a] [formerly b535c90a23 [formerly 08ee82c39a [formerly 5c5eb6f348627f65afc527205c5bc1f7b7463ddb]]]
Former-commit-id: b535c90a23
Former-commit-id: 11734a11ae5f09b05df469fcfb5ec781a7813557 [formerly e54ab69bf7]
Former-commit-id: 48b19f3833
 2014-03-06 10:38:30 -06:00
Steve Harris
d2a6b0c18b Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8) 
merge performed by Richard Peter

Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
	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.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh

Former-commit-id: 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0]
Former-commit-id: 587f15a95d
 2014-03-06 08:39:43 -06:00
Nate Jensen
1a21140770 Issue #2627 shorten wrapper arg for retaining failed data 
Change-Id: Ib02246cef47d3a19caa61baedbc5538c07d073d7

Former-commit-id: ee84466b3c [formerly ad7d5a745b] [formerly c07f2e829d] [formerly 0dc5dfae82 [formerly c07f2e829d [formerly 54578116023ebc7a6474a3297d419c2777d31e17]]]
Former-commit-id: 0dc5dfae82
Former-commit-id: 3ed2948010b10a83db8a0e121f679148f5130c8c [formerly 08ac542f2f]
Former-commit-id: d3a10ba1e6
 2014-03-05 09:04:10 -06:00
Richard Peter
e188d13ce1 Merge "Issue #2627 harden static initialization on edex main thread" into development 
Former-commit-id: 2be140c0c4 [formerly fdba3b3099] [formerly 7c02ab6b66] [formerly 6b08aaf55c [formerly 7c02ab6b66 [formerly 82f20a96a82ef7f047f716662d319e522ee1c394]]]
Former-commit-id: 6b08aaf55c
Former-commit-id: 492f316506c2780dd12c817c21369a49396beff4 [formerly c12b4fb4ea]
Former-commit-id: f6e1fc89de
 2014-03-04 17:54:09 -06:00
Nate Jensen
0122afaf40 Issue #2627 harden static initialization on edex main thread 
Change-Id: Icff0a2fd60bec882ac96fc218deb88b16eaeaaff

Former-commit-id: e458ca5c52 [formerly 99254281af] [formerly b989b7240c] [formerly 660998ac72 [formerly b989b7240c [formerly bb838950a2979703ae6ab8f486fc4460789c3f1b]]]
Former-commit-id: 660998ac72
Former-commit-id: 7ec8c1c2768c7da3e60681607289e7157433c1ad [formerly 81a6675a14]
Former-commit-id: fadd59b36d
 2014-03-04 17:19:24 -06:00
Brian Clements
19bb5d8de9 Issue #2756 added security toggle to collaboration 
security on HTTP server can be disabled for legacy clients from openfire settings
added xmpp connection retry to http server so servers can be started in any order


Former-commit-id: 2482a58273 [formerly cd0e1e271a] [formerly 7b085f62de] [formerly f44f1212dd [formerly 7b085f62de [formerly 1e52606fe709f2cf27f835363ca5ab2bf6ada912]]]
Former-commit-id: f44f1212dd
Former-commit-id: c63989e0c0ae952f12584b6484f4cc133f757e99 [formerly 0790849f03]
Former-commit-id: c446513912
 2014-03-04 16:02:25 -06:00
Benjamin Phillippe
fe6d70a38f Issue #2769: Added batching to registry sync 
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db

Former-commit-id: 7ad21da089 [formerly 7bf51d507e] [formerly 59323be87e] [formerly 9fd35140f0 [formerly 59323be87e [formerly a265027cacde7690171d30455227c5a843e0d397]]]
Former-commit-id: 9fd35140f0
Former-commit-id: 5c8dacb79a884329e899f0613609bd34935428e9 [formerly cd04d7dcbe]
Former-commit-id: daeb8bec5f
 2014-03-04 13:31:41 -06:00
Richard Peter
75f96fe190 Merge "Issue #2769: Registry database deadlocking fixes/performance improvements" into omaha_14.2.1 
Former-commit-id: 2b5339e16f [formerly 5280398130] [formerly aa8e1a3625] [formerly f9bd27c061 [formerly aa8e1a3625 [formerly 26cbe68f0a86660968016da88a4b51d1735e8227]]]
Former-commit-id: f9bd27c061
Former-commit-id: d8b132631aeda3ce7743ca02d1af158db917cca9 [formerly 3b800bcc09]
Former-commit-id: a81447f434
 2014-03-04 12:54:23 -06:00
Richard Peter
7e096adc4a Merge "Issue #2791 Use Data Source for all grid data access." into development 
Former-commit-id: 83b99aad5c [formerly 090829f75e] [formerly f87a913017] [formerly 873fa00fac [formerly f87a913017 [formerly 0b9954f00ca5f5a61a1cd79d094408e43b115abe]]]
Former-commit-id: 873fa00fac
Former-commit-id: 31ea5b7bbf5848e0ada30ca517c3c6b17e7d4154 [formerly 2a5b0fb3ba]
Former-commit-id: 3a96d0758a
 2014-03-04 12:43:17 -06:00
Nate Jensen
fc953460b7 Merge "Issue #2870 log product id when generic packet fails to find corresponding packet class" into development 
Former-commit-id: e74b0c2854 [formerly d0e405aac9] [formerly ea0248ff96] [formerly 4547cbcfea [formerly ea0248ff96 [formerly 51797cd167b76be2b3ab55b6c7632e0039d7145c]]]
Former-commit-id: 4547cbcfea
Former-commit-id: 9e20fa9103fca3117e471be18adfb89e0f743437 [formerly 471492201c]
Former-commit-id: 2dba0228c2
 2014-03-04 12:39:13 -06:00
Richard Peter
eb84b01b25 Merge "Issue #2829 - fix the spelling of 'coordinate' in GfeUtil" into development 
Former-commit-id: 560d3ea59f [formerly 650f794329] [formerly bd94f6bf99] [formerly 4fbb2f0059 [formerly bd94f6bf99 [formerly 12458982fe4c43a9b61e9194246c80527d02da6d]]]
Former-commit-id: 4fbb2f0059
Former-commit-id: 5a213f229ea6ad72f4cd884b9d5a24db5f6d4023 [formerly 363e9e294f]
Former-commit-id: 58f05e288f
 2014-03-04 12:38:30 -06:00
Richard Peter
58e8cc7dd3 Merge "Issue #2713 Update path for MADIS-Harvester.xml Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788" into development 
Former-commit-id: f343b87101 [formerly 15c9066986] [formerly bc8b838a41] [formerly 178bfc0b79 [formerly bc8b838a41 [formerly 234b6b7010e6eb044fbf1fc4728a58dc5cb84c8e]]]
Former-commit-id: 178bfc0b79
Former-commit-id: a0e4b52a5d8449aeb28040899d5f6f7c762141e4 [formerly e350b5bae1]
Former-commit-id: b3c2df969a
 2014-03-04 12:38:07 -06:00
Nate Jensen
c8f3303317 Issue #2870 log product id when generic packet fails to find 
corresponding packet class

Change-Id: I839e622b063eae4e707f9abc31f010ef795bc9f1

Former-commit-id: 02a7daf658 [formerly ef05ddc408] [formerly a1caeae552] [formerly 6818ea9c23 [formerly a1caeae552 [formerly 0d01b387e454f276d0ebdecfb14ad294b67a55b7]]]
Former-commit-id: 6818ea9c23
Former-commit-id: 147db2f60cd783078998957a4fefc35f48373315 [formerly 552a2af0b9]
Former-commit-id: b095d91c92
 2014-03-04 11:52:34 -06:00
Nate Jensen
be64298394 Merge "Issue #2673 Add ability to query only ref times to Data Access Layer." into development 
Former-commit-id: 6389e2fb02 [formerly 92e8393915] [formerly 3afd14e1eb] [formerly 9b94434a78 [formerly 3afd14e1eb [formerly eb07c44098abe7f72b578e24a4a7ea7e92dc655c]]]
Former-commit-id: 9b94434a78
Former-commit-id: 813a67cfd0eabada60dcb3b8d68f61ef21cd4c70 [formerly 93da8c2075]
Former-commit-id: c58926d598
 2014-03-04 11:42:51 -06:00
John.McPherson
32a8e0cd90 ASM #113 DR 16464 rsync_parms.site may not always exist for Service Backup 
Change-Id: I2abbb68dcbd064483a262ddba4b9ab9e0dee211a

Former-commit-id: 43f04342eb [formerly 058bb8d60e] [formerly bdbe5577e9] [formerly 2d8ce4e577 [formerly bdbe5577e9 [formerly 4d9b74dc181c359681eda8bae04f7c46f41d5769]]]
Former-commit-id: 2d8ce4e577
Former-commit-id: 417005f990612d7bc085d5a7ba17873c67485e17 [formerly 218f2de16a]
Former-commit-id: f1eeaf6580
 2014-03-04 17:24:00 +00:00
Nate Jensen
b920fdd0aa Issue #2813 fix subscription package names 
Former-commit-id: 645fec513a [formerly af76b58b27] [formerly 0ec866f1d2] [formerly d7d0803ee9 [formerly 0ec866f1d2 [formerly 081b621b5932d77c03117840e887ed7017f1d48b]]]
Former-commit-id: d7d0803ee9
Former-commit-id: d585d2501f41607fabbcad8c30a1a4244b7f07c5 [formerly df44f8246e]
Former-commit-id: 78b2b50370
 2014-03-04 10:53:58 -06:00
Brian.Dyke
c1ef56e0d7 OB_14.1.1-21 baseline 
Former-commit-id: 5179a4f970 [formerly 271ec85c0c] [formerly 1d92e5bab6] [formerly 29681c7ca4 [formerly 1d92e5bab6 [formerly d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b]]]
Former-commit-id: 29681c7ca4
Former-commit-id: 146eb0a75db603df40a613354b8cbc0908ec3abb [formerly 7cad374af5]
Former-commit-id: c68649b4f9
 2014-03-04 11:47:42 -05:00
Bryan Kowal
b5840bb880 Issue #2829 - fix the spelling of 'coordinate' in GfeUtil 
Former-commit-id: 5ded2afc7b [formerly 83471b4900] [formerly e6ae710871] [formerly 56e79f2179 [formerly e6ae710871 [formerly a06c8efe8b316359cfb0d4feaa7ea8f36e4122e7]]]
Former-commit-id: 56e79f2179
Former-commit-id: 25690eebf00737ce2c3db1b4cd9bff6a9a40ab7f [formerly eda1dc4142]
Former-commit-id: 3c42fa358e
 2014-03-03 17:45:09 -06:00
Ben Steffensmeier
3613b62fe1 Issue #2673 Add ability to query only ref times to Data Access Layer. 
Former-commit-id: 2807ec9b07 [formerly 2230164e1f] [formerly 641d4acd15] [formerly 9fcb730858 [formerly 641d4acd15 [formerly 37c406a9945bfb6ccb99d2472b44d649f2ce18d0]]]
Former-commit-id: 9fcb730858
Former-commit-id: 614b30500251a3eee6fb9711755f92aabf706b56 [formerly 1d2d1e20f5]
Former-commit-id: b9b5068329
 2014-03-03 17:44:11 -06:00
Brian Clements
11b30001d5 Issue #2756 install script for collaboration http server 
added check for non-edex deployment in plugin-methods.xml
added dataserver feature to use feature-based deployment scripts
moved start/stop scripts to subdirectory
reworked start script to work with external classpath jars


Former-commit-id: 769ee18145 [formerly a738448825] [formerly 443f420c0e6fc38c2a3fdd4e4aa68d8a8fb91db6 [formerly 3b6121b9fa]] [formerly 934ce73e4b [formerly 3b6121b9fa [formerly 7d476e67ad00cc8e9c494ed04c7ce0ecc691059a]]]
Former-commit-id: 934ce73e4b
Former-commit-id: 066c81f999fa0b82f0f2cf806a4411393bd5ac3c [formerly a44c5f8d48]
Former-commit-id: 75c179b06f
 2014-03-03 14:07:01 -06:00
Benjamin Phillippe
71d5fbda33 Issue #2769: Registry database deadlocking fixes/performance improvements 
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0

Former-commit-id: ea31c5b370 [formerly d339e232f4] [formerly ed050996a2] [formerly 5483d6d7ae [formerly ed050996a2 [formerly a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e]]]
Former-commit-id: 5483d6d7ae
Former-commit-id: d73e719f11d2bc9e27c664078a07b85c55da2615 [formerly 15a5e7c4a4]
Former-commit-id: 603e433054
 2014-03-03 10:57:16 -06:00
Juliya Dynina
5e4f8d03ef Merge "ASM #78 - Fix MDCRS display" into asm_14.2.2 
Former-commit-id: fbe297b24b [formerly 6fd59caff3] [formerly 0130876a7a] [formerly 4bc91be899 [formerly 0130876a7a [formerly 081b98f0e1a2dad2d4aff981cbe9980e0c97e12a]]]
Former-commit-id: 4bc91be899
Former-commit-id: accedf49cbe87e91b7157b357a1dcb1372fcc111 [formerly 7a30b05e9a]
Former-commit-id: 6e3dbfdff7
 2014-03-03 11:27:39 -05:00
Dave Hladky
b39450bcd2 Issue #2713 Update path for MADIS-Harvester.xml 
Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788

Former-commit-id: afef25c604 [formerly fb2cfff4d2] [formerly 92d677141f] [formerly d40107e530 [formerly 92d677141f [formerly f6e63a5d65a5450eb58e59833091b41ef4bf0a3f]]]
Former-commit-id: d40107e530
Former-commit-id: 758b85a458cc5427609844effdd15c25ff39ee6d [formerly 06d41ccafa]
Former-commit-id: dd3501ae41
 2014-03-03 08:46:37 -06:00
Ben Steffensmeier
374ad2c1e8 Issue #2791 Use Data Source for all grid data access. 
Former-commit-id: 16b6723cbb [formerly 02cef4ddaa] [formerly 6fa441396f] [formerly 05770129c1 [formerly 6fa441396f [formerly 961c232e35da077ef4fc0b62cb04a8f4cb9fb6f0]]]
Former-commit-id: 05770129c1
Former-commit-id: bc40fd62dff2b342470d96a6441fc6239af6c193 [formerly 4094ef6170]
Former-commit-id: 72b117cf42
 2014-02-28 17:06:33 -06:00