Mike Duff
cbc15d479a
Issue #2632 - Don't execute notifier on null presence, fix bug with group in UI when deleting last user in group, property change to handle String and Boolean.
...
Change-Id: I533e0831529038cb4205e38e706369ca74f4f824
Former-commit-id: bb2b251cd0
[formerly 6444131768
] [formerly 8068c9aa83
] [formerly e01c5c3534
[formerly 8068c9aa83
[formerly 13f134bafc5331939e23ce0e14d350593bb7c2e1]]]
Former-commit-id: e01c5c3534
Former-commit-id: ea4a4997b336401081920b43fb91017011502ca3 [formerly 832dd498fc
]
Former-commit-id: 4fddc0c631
2014-03-12 10:52:18 -05:00
Nate Jensen
f35f49a0bb
Merge "Issue #2702 Updated openfire version in component spec." into development
...
Former-commit-id: 7a8cddff16
[formerly d8100732d6
] [formerly e57b0a334fca92b3336ad9771f196ecb502e5126 [formerly 35f778f5b9
]] [formerly c5647be7e0
[formerly 35f778f5b9
[formerly 2b8374ea8be4b36e3c6276ced6938a3e97c42201]]]
Former-commit-id: c5647be7e0
Former-commit-id: 0e547b67bf148216e690ddc386998031ff1a110e [formerly f430ddc5d9
]
Former-commit-id: 0d62cf1def
2014-03-12 10:02:42 -05:00
Richard Peter
abf39442ba
Merge branch 'omaha_14.2.1' (14.2.1-11) into development
...
Change-Id: I5634c5762d47463b1e636271462800d36100b8a1
Former-commit-id: 751b37616e
[formerly 042468f761
] [formerly 7af0cfaf38
] [formerly 7ebbc0cf78
[formerly 7af0cfaf38
[formerly 3f0cf9200a42adb2bd7dbd70e50642e940d6b822]]]
Former-commit-id: 7ebbc0cf78
Former-commit-id: 67499353bc5b2802a0bbc17ca5f119b6ddd6836d [formerly e8ea7b80e6
]
Former-commit-id: f5e1fb569a
2014-03-12 09:47:29 -05:00
Brad Gonzales
9dc545e82c
Issue #2702 Updated openfire version in component spec.
...
Change-Id: I604d64003c74efe71782daf55e3bda9cbebb9498
Former-commit-id: 57b81b8031
[formerly c7d06ff946
] [formerly ccb312d46f
] [formerly bf0d052043
[formerly ccb312d46f
[formerly 276c38754b7f917c229750ce06d387a8b63245d4]]]
Former-commit-id: bf0d052043
Former-commit-id: 703b3cf04e5992070f4a2edcfcaf0eac8a3d91d3 [formerly dae0963531
]
Former-commit-id: ec34591f08
2014-03-12 08:48:36 -05:00
Brian Clements
fb6be670b1
Issue #2827 fixed collab dataserver returning empty body with 200
...
we check if a file exists in and out of the lock when reading
if the file is deleted between checks, the inner check attempts to return an error
we had already access the output stream from the response object so it is committed to 200
fixed by waiting to get the output stream until after the second check
Former-commit-id: 2aa9dcb248
[formerly ce1038723d
] [formerly bfde9c37ce
] [formerly d44c55e976
[formerly bfde9c37ce
[formerly 31c42d161146b0367435c66535d4da700a572f24]]]
Former-commit-id: d44c55e976
Former-commit-id: 1b8f3ce536ab968c6e5e63d5bfe2ffc91722e548 [formerly d693c07bb4
]
Former-commit-id: ab86cda554
2014-03-12 08:27:22 -05:00
Greg Armendariz
bd21fe4063
Merge "Issue #2851 - initial 64-bit build of the bignsharp DLL" into development
...
Former-commit-id: 015bf62723
[formerly 195383130c
] [formerly da34c3d2da
] [formerly 6acf5fefcc
[formerly da34c3d2da
[formerly 5346beaf24ad66cfffab9e115c8d22b4c2fe2f95]]]
Former-commit-id: 6acf5fefcc
Former-commit-id: 32fc0e0fb0aa1a2719afcfd069aa06ee04f133d8 [formerly 2aa74592d7
]
Former-commit-id: 9f51095c62
2014-03-11 19:56:55 -05:00
Lee Venable
c68de2cde1
Merge "Issue #2865 - added more null and dispose checks" into development
...
Former-commit-id: 6380c83d55
[formerly 6d02134d89
] [formerly ae63879ddf
] [formerly 36f72f23dc
[formerly ae63879ddf
[formerly 5c21cbb43cda9274a77b2358749ba53b397ef0e1]]]
Former-commit-id: 36f72f23dc
Former-commit-id: 3b6c997b64c9324be5f2db8be91ce169da136a9f [formerly d7fc7f791d
]
Former-commit-id: 2e127e20eb
2014-03-11 17:43:48 -05:00
Nate Jensen
97c46f5680
Merge "Issue #2791 Fix fill value filter." into development
...
Former-commit-id: 8fc426c59d
[formerly 2c6ca9840c
] [formerly 80a2807ce4
] [formerly 249d0f3ded
[formerly 80a2807ce4
[formerly 871280fb9fac9b09908243b1753abb087b204f23]]]
Former-commit-id: 249d0f3ded
Former-commit-id: 919918e52e15487483a5bfa833598fc47e0aa314 [formerly 266e87f935
]
Former-commit-id: 0fc7fde66d
2014-03-11 17:33:54 -05:00
Ben Steffensmeier
c730a6673e
Issue #2791 Fix fill value filter.
...
Former-commit-id: bafe8b1bb2
[formerly 538fb61ae0
] [formerly 4eb2d74e1c
] [formerly 1a45efe2a5
[formerly 4eb2d74e1c
[formerly e845b829ba4518ac41f0ac26c22c3d83a5504375]]]
Former-commit-id: 1a45efe2a5
Former-commit-id: e58e298814694eac7d464d26f1709c1c11029359 [formerly c754db3ae3
]
Former-commit-id: 6df4977dc2
2014-03-11 17:27:26 -05:00
Bryan Kowal
cfe069e216
Issue #2851 - initial 64-bit build of the bignsharp DLL
...
./ncep/gov.noaa.nws.ncep.ui.nsharp.win32/bignsharp.dll
./ncep/gov.noaa.nws.ncep.ui.nsharp.win64/bignsharp.dll
file ./ncep/gov.noaa.nws.ncep.ui.nsharp.win32/bignsharp.dll
./ncep/gov.noaa.nws.ncep.ui.nsharp.win32/bignsharp.dll: PE32 executable for MS Windows (DLL) (console) Intel 80386 32-bit
file ./ncep/gov.noaa.nws.ncep.ui.nsharp.win64/bignsharp.dll
./ncep/gov.noaa.nws.ncep.ui.nsharp.win64/bignsharp.dll: PE32+ executable for MS Windows (DLL) (console) Mono/.Net assembly
Amend: update Java version and Plugin version
Change-Id: I377e8b51eb9d7fd9964092040d1bcde3f9bcfd27
Former-commit-id: 40578d5fe0
[formerly b0de1fba76
] [formerly cac6709da8
] [formerly 438e594868
[formerly cac6709da8
[formerly 3189f870d55219372438213441fd1359a6bb5cc4]]]
Former-commit-id: 438e594868
Former-commit-id: deff90d8a30f3ac8617a91216fe1f97ec2c6f28a [formerly 9ec8e864a7
]
Former-commit-id: fe9b652d52
2014-03-11 16:47:11 -05:00
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
Lee Venable
9b11bcedb1
Issue #2865 - added more null and dispose checks
...
Former-commit-id: 7f6792f1c5
[formerly fe6e7328c0
] [formerly df65d7c7ce
] [formerly 1f9d1af221
[formerly df65d7c7ce
[formerly c2aa1d021c49e522a3b4a9dd17a55317a13e91e1]]]
Former-commit-id: 1f9d1af221
Former-commit-id: ebbc4eff228045a38bf9d41b60b39929f6e27fbe [formerly 46fa017e1b
]
Former-commit-id: 8ef7fe57c4
2014-03-11 16:30:33 -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
Nate Jensen
054d624717
Merge "Issue #2702 Removed openfire 3.7.1 tar. Fixed openfire patch to work with openfire 3.9.1. Updated package.sh to use openfire tar from awips2-static directory. Added a -buildRPM target to build.sh to build a specific RPM." into development
...
Former-commit-id: 2c4b520080
[formerly 221b57892c
] [formerly 1b11e23257
] [formerly a1bf3e9874
[formerly 1b11e23257
[formerly 8d4e32df3a8374e571a3a9d3994e45ea825c418f]]]
Former-commit-id: a1bf3e9874
Former-commit-id: 6303b5d6160c59ed7eaa1c85b6bcd209d15b757d [formerly 2e21069300
]
Former-commit-id: 5b57abd527
2014-03-11 12:35:53 -05:00
Nate Jensen
fd0a81a181
Merge "Issue #2896 Fix sat best res on weird projections" into omaha_14.2.1
...
Former-commit-id: a9811bdb2c
[formerly cef0438c35
] [formerly 85f5821a6f
] [formerly afbdf6962c
[formerly 85f5821a6f
[formerly d463531d4cf3bce8862ce1c29b12e9a594d8c63b]]]
Former-commit-id: afbdf6962c
Former-commit-id: 2ac85b86fee6285f476e7194d549ae07555767d9 [formerly 09f4bd9883
]
Former-commit-id: 3411167042
2014-03-11 12:35:44 -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
Nate Jensen
6eb08c2faf
Merge "Issue #2900 Added NWSAuth to import for DD viz feature" into development
...
Former-commit-id: 1516cd6177
[formerly 8e0fff8bb4
] [formerly a1533481b3
] [formerly 4ee98a10cd
[formerly a1533481b3
[formerly 22518ce352166afc70950d631b5df8cbcc063a3d]]]
Former-commit-id: 4ee98a10cd
Former-commit-id: 0a164320bd83789017f0e070bf743231a5b0cdd6 [formerly abe081b019
]
Former-commit-id: c0ee40b137
2014-03-11 11:30:27 -05:00
Brad Gonzales
4e44cdcfd4
Issue #2702 Removed openfire 3.7.1 tar. Fixed openfire patch to work
...
with openfire 3.9.1. Updated package.sh to use openfire tar from awips2-static directory.
Added a -buildRPM target to build.sh to build a specific RPM.
Change-Id: I3502e42d92d519968aeb8b5fbc1f38b277f48c6a
Former-commit-id: f70d572802
[formerly cbac19d219
] [formerly 09d27e99b5
] [formerly 48b6c75bb3
[formerly 09d27e99b5
[formerly 606b269f39ed58e855d9fcba2487fccbaac3c28c]]]
Former-commit-id: 48b6c75bb3
Former-commit-id: 7d3abbb7bdae80a54f033641942cda32bb82bb2a [formerly 5d5ab33db3
]
Former-commit-id: f53845738c
2014-03-11 11:27:44 -05:00
Ben Steffensmeier
20b99bc6c5
Issue #2896 Fix sat best res on weird projections
...
Former-commit-id: a9c4875038
[formerly c7fa392f3f
] [formerly 8bb517836a
] [formerly 560fc688bc
[formerly 8bb517836a
[formerly 029b8b30365fd3ec2cb9f5139dec02cc918a0dbb]]]
Former-commit-id: 560fc688bc
Former-commit-id: 3dd12b4d2d8faad952b606b3c39220f5602545d4 [formerly b474e92189
]
Former-commit-id: 7a06fdd71a
2014-03-11 11:07:43 -05:00
Dave Hladky
e804573ef9
Issue #2900 Added NWSAuth to import for DD viz feature
...
Former-commit-id: 117064bbe1
[formerly e3701c0810
] [formerly a2a66b028d
] [formerly 171bb37b0a
[formerly a2a66b028d
[formerly 9800d488dfb626c12b8b84f34af06dbbd7d574b0]]]
Former-commit-id: 171bb37b0a
Former-commit-id: 2c10589792c97842540ded77984902908c6b1f40 [formerly b1fc6536c9
]
Former-commit-id: 7e384d27a1
2014-03-11 11:04:34 -05:00
Lee Venable
8bec7ebcb1
Issue #2865 - fixed font memory leak
...
Change-Id: I0cfbd494924aadcb134c60313836cb9ab815253d
Former-commit-id: 7aab4252d5
[formerly 44733489b9
] [formerly 2c67c4f6c4
] [formerly 58d7f759b2
[formerly 2c67c4f6c4
[formerly 2555d382f26278c5f972c17da778338142cdaaec]]]
Former-commit-id: 58d7f759b2
Former-commit-id: 8fe2ec93b5265755e9333c787d93b1c92293eceb [formerly a5487de998
]
Former-commit-id: 86e6547a63
2014-03-11 10:31:50 -05:00
Nate Jensen
219f232fcb
Issue #2779 update memory settings for renamed NC perspective
...
Former-commit-id: ebf5186d75
[formerly 17aa39ce0a
] [formerly ccb06db199
] [formerly 5eb892f4cf
[formerly ccb06db199
[formerly bc1c10ee0039906ec0b48e834e533332611ac0d3]]]
Former-commit-id: 5eb892f4cf
Former-commit-id: dc64b4c9b5a35e0a38967549f2d086cd34c1fedf [formerly 22ff235bcf
]
Former-commit-id: 42c545804c
2014-03-11 10:28:01 -05:00
Brian.Dyke
a42c10c21d
Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 1cb3691cc4
[formerly fa16721854
] [formerly 552490206f
] [formerly fcc9115b0d
[formerly 552490206f
[formerly eaa41b4f2dd9fce2d957a2311ee3f4f04f220365]]]
Former-commit-id: fcc9115b0d
Former-commit-id: 96892f7695c369e44e299b4077a8590a12b79541 [formerly 83822661e8
]
Former-commit-id: 3070b42ed3
2014-03-11 10:44:03 -04: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
Nate Jensen
c5ca4739cd
Merge "Issue #2848 fixed session create, listen, join ordering" into development
...
Former-commit-id: 3c6667cd58
[formerly 64b7c84018
] [formerly 722216e319
] [formerly fb2677db7d
[formerly 722216e319
[formerly 89427f93a4459a2f5feeac4f9df00db3143eb998]]]
Former-commit-id: fb2677db7d
Former-commit-id: 118a405e684ed645c200cc1fd8cb608074029d93 [formerly 9633d5f252
]
Former-commit-id: ac028d6583
2014-03-10 17:36:06 -05:00
Steve Harris
15035a01cc
Merge branch 'omaha_14.2.1' (OB_14.2.1-11) into development
...
Former-commit-id: d8badc8bea
[formerly e62a399e9f
] [formerly 4c52fb5bb3
] [formerly cfc9fea413
[formerly 4c52fb5bb3
[formerly 7be5e87cee69f0d20ae8d01a10b65f2fcadb0ba3]]]
Former-commit-id: cfc9fea413
Former-commit-id: 47d576172614afbe5d714782f88cfa8fc696489d [formerly 57f2a3204e
]
Former-commit-id: 0c0bc58b3e
2014-03-10 16:01:16 -05:00
Ben Steffensmeier
d2ab10b037
Issue #2867 Better validation of image export frame range.
...
Former-commit-id: 3a92ec7284
[formerly bde80aec1b
] [formerly e75b961db5
] [formerly cc8b71fbdf
[formerly e75b961db5
[formerly 6a3a62b913de1d508fb0d470d06a8be4a61918a3]]]
Former-commit-id: cc8b71fbdf
Former-commit-id: e808a55480a4efe5ce4ecf95f2e66eabb231b4c8 [formerly 9c82499818
]
Former-commit-id: 77e3f15d0b
2014-03-10 15:24:07 -05:00
Ben Steffensmeier
60506ffe8a
Issue #2791 Add numeric to alertViz feature.
...
Former-commit-id: 6280932901
[formerly 525f6b19bf
] [formerly f88e1c329e
] [formerly 2f75103635
[formerly f88e1c329e
[formerly 9918eeec97938cbc7c703738800521773fbb4a87]]]
Former-commit-id: 2f75103635
Former-commit-id: 3705b85b6fa911d7173a7bcd00ef46993c1ad2e6 [formerly eaa570c3f2
]
Former-commit-id: db9729ef73
2014-03-10 14:55:54 -05:00
Brian.Dyke
3667299983
Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 90154e7ae1
[formerly bcf9a5dc83
] [formerly c6f2010ce6
] [formerly 4269f9d875
[formerly c6f2010ce6
[formerly 0e02910adc2ef73df2eff5b41c1e9945a5536a0a]]]
Former-commit-id: 4269f9d875
Former-commit-id: 738fc5f415c773f7bde24fd1a60b618f33307d23 [formerly a453d3fd68
]
Former-commit-id: c26c40d6e3
2014-03-10 15:42:38 -04: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
Brian.Dyke
d197a72c20
Merge branch 'ncep_14.2.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: 8d4a1e1204
[formerly 24785068be
] [formerly d710aec521
] [formerly fda6ab1344
[formerly d710aec521
[formerly ac54324fb0eff1483dd2c3aa8d94273760451dab]]]
Former-commit-id: fda6ab1344
Former-commit-id: 6ec1b00cf64c71cead90fca582edef188ec24710 [formerly 0aff5875b0
]
Former-commit-id: c5502af3fa
2014-03-10 15:14:59 -04:00
Brian Clements
67db5cb4f8
Issue #2848 fixed session create, listen, join ordering
...
clients were missing events and messages because listeners weren't up before joining
collaboration connection needed to add to session map before joining the session
display containers needed to register with session event bus before joining the session
clients no longer send events to empty sessions
Former-commit-id: 9b6c283fc9
[formerly 2456c2308f
] [formerly dc55cd5b5c
] [formerly aee98ecfb0
[formerly dc55cd5b5c
[formerly e832f6420b6363a3c951725e0d23f460b2efb42e]]]
Former-commit-id: aee98ecfb0
Former-commit-id: eb63cfebccc689b3ac62c518759624fc43c5c7b9 [formerly 4f9a2577f2
]
Former-commit-id: 3486f1f241
2014-03-10 14:06:45 -05:00
Nate Jensen
8193df431d
Merge "Issue #2673 Fix name of lighning data factory." into development
...
Former-commit-id: 8275d3591f
[formerly c2c596b6bc
] [formerly 43de990a4c
] [formerly 873f06e85e
[formerly 43de990a4c
[formerly 5c828c0ddfdf6e29ddfaf706409edda5fb307ade]]]
Former-commit-id: 873f06e85e
Former-commit-id: 7eacbf882dab2b1f96227ef8852150b11dae8ecf [formerly ffbc63b67a
]
Former-commit-id: 5e3ecd33fa
2014-03-10 13:53:45 -05:00
Nate Jensen
ba37e2937d
Merge "Issue #2832 consolidate watch and warning recycle logic" into development
...
Former-commit-id: e56dfc35c4
[formerly 89cdc44635
] [formerly 9cb27d5e95
] [formerly 2570c295d5
[formerly 9cb27d5e95
[formerly 4029d0d863bf6da254859028353a271dec70e335]]]
Former-commit-id: 2570c295d5
Former-commit-id: dcb2d2450927fda01dd0d5edc5f961b453d88fb4 [formerly cab7dadbe8
]
Former-commit-id: f48251da57
2014-03-10 13:52:53 -05: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
Nate Jensen
43fbd5573a
Issue #2832 consolidate watch and warning recycle logic
...
Change-Id: I9d7e284bafbe8073ac99eb3ce0e7fbd81f3ff889
Former-commit-id: 8fcbba4b82
[formerly 8e734f917e
] [formerly 4fec0ffcd347c78ea0a9063a1d7bb3ceda5568da [formerly 057f7671a0
]] [formerly 8cd98e0b9f
[formerly 057f7671a0
[formerly 814d21d0a5b58c95f6339e1816788953692f5e95]]]
Former-commit-id: 8cd98e0b9f
Former-commit-id: 2e812a9ce3352be5f400be9322dc2565a3748076 [formerly 1646574f5a
]
Former-commit-id: 39f2a03d21
2014-03-10 13:02:45 -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
d32d855bb2
Issue #2779 add .ini generation of memory settings for other components
...
Former-commit-id: b77dde280f
[formerly 5a88f31a2b
] [formerly 6a75fe686a
] [formerly d599db4af2
[formerly 6a75fe686a
[formerly 71a7f485c5a32caeabc98f23164c9fc87cfa1787]]]
Former-commit-id: d599db4af2
Former-commit-id: 097c1a455c355cc0ebe8f7b95797516bfc05c8c6 [formerly 5094008bea
]
Former-commit-id: 39aa26c2b6
2014-03-10 10:03:02 -05: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
Nate Jensen
c22f8f2a07
Merge "Issue #2751 ensured that room admins know real userids" into development
...
Former-commit-id: 181060825e
[formerly 1306957f2a
] [formerly e787cac9af
] [formerly e963c7c4a1
[formerly e787cac9af
[formerly e6feac94800c2dd82afcf42ca9f387b24514deff]]]
Former-commit-id: e963c7c4a1
Former-commit-id: ba716a9976681eb2fe24b90c93cd383526039e18 [formerly 4dd4805e33
]
Former-commit-id: ede24100b6
2014-03-10 09:15:39 -05:00
Nate Jensen
c15c40c252
Merge "Issue #2826 fix collaboration mosaic image disposed issue" into development
...
Former-commit-id: b98ec97406
[formerly bedb7b7653
] [formerly f5a08f1f86
] [formerly d04751a986
[formerly f5a08f1f86
[formerly 24492229a0bddc3db1b6945fcd2a89a486f1ef2e]]]
Former-commit-id: d04751a986
Former-commit-id: dba28ac337f99c6e321ea3a49f0294746750950c [formerly 9c5f87dc03
]
Former-commit-id: c5555eaa0c
2014-03-10 09:04:51 -05:00