labofsahil/github-event-dataset-2012 huggingface dataset:
added dev-haskell/heaps

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
shakespeare-1.0.1
shakespeare-css-1.0.1.3
shakespeare-text-1.0.0.3
hamlet 1.1.0
shakespeare-js-1.0.0.4
loosen hspec test dep in shakespeare-text
loosen hspec test dep in shakespeare-css
loosen hspec test dep in shakespeare
yesod-core wants hamlet 1.0, loosen hspec dep in hamlet
Loosen hamlet dep in happstack-hamlet - not tested, only built with hamlet 1.0
Bump hakyll to 3.4.0.0
Bump hakyll-contrib to 0.1.0.1
Bump acid-state to 0.6.5
Expanded wiki, script patches
dva komentz k TODO v CodeGenExpr.
Add Gaussian smearing to plot utilities.
Add method to get smeared densities from DOS.
Add option to plot dos with smearing.
Fixes to feff.
Feff update.
Another url correction
Everybody should use their favorite RSpec formater
Added Scala as ts=2
Added snippet for Scala.
Merge branch 'master' of github.com:mauricioszabo/vim-plugins
added man page for oo-admin-ctl-app
move old /bin/ to /sbin/ references where applicable, clean up
Speaker API
the other edit
and other
edit after merge in branch
another edit
Revert "edit after merge in branch"

This reverts commit 6dcfbe83fe6995f67344181eb252f71f844d7cb4.

Conflicts:
	files/file1
Revert "Revert "edit after merge in branch""

This reverts commit bd5e926ee7183afd8cf07a3a6b77affc307216e0.
Revert "edit after merge in branch"

This reverts commit 6dcfbe83fe6995f67344181eb252f71f844d7cb4.

Conflicts:
	files/file1
Revert "another edit"

This reverts commit 16443828a0a6a6975198a508ca5a4a542b9d62ba.

Conflicts:
	files/file1
encapsulate CIK validation logic and USE IT.
hw3 - part3
Adding build.xml.
Updating README for 1.0.1.
Update header on API Docs
Move analytics to head again
Download page: Delete last version from Older versions
update readme to clarify that the demo is broken atm
Factored session dependency out of Ring middleware
Ignore specific build files
Attempt to simplify build process

 * Removed settings.cfg
 * Removed test.sh
 * Added 'make test' target to run py.test
 * Reworked Makefile to allow for proper build-file detection
Whitespace cleanup (replace <tab> with spaces)
Merge branch 'master' of git://github.com/mfalesni/cloud-app-sanity

Conflicts:
	Makefile
	runtests.sh
Merge branch 'master' of git://github.com/mfalesni/cloud-app-sanity
Update README instructions
Updated Twitter Bootstrap License
i made some chane
changed favorite, about and contact pages
Add partial for showing tags for an entity.
initial support for sending test output to a buffer other than the repl

This can be used in conjunction with
swank.core.server/make-output-redirection and a custom slime-output-target:
https://github.com/technomancy/swank-clojure/commit/83546c0899e28410eb201d6effd722c0b33b182d

Later, I'll add a clojure-test-mode command to set the output targe location.
tramp support for jack-in and get rid of "*slime-repl nil*" problem

This also has slightly nicer window handling, in that it jumps to the
slime-repl window and moves to the end of the buffer.

NOTE: This depends on matching changes to swank-clojure's 'lein
jack-in' command.
automatically translate remote/tramp slime filenames

Users might have their own variant of this installed. Fortunately,
multiple translations don't do any harm.
fix bug in swank process cleanup
add clojure-in-tests-p and clojure-jump-between-tests-and-code
prevent clojure-jack-in-sentinel from barfing when the swank-buffer is gone
refactor clojure-jack-in into a set of smaller functions

- this will make it easier to add support for ssh tunnels to remote
  swank and graceful handling of older versions of swank that don't
  support 'lein jack-in <port> <hostname>'

- also fixes the *slime repl nil* bug, but at the cost of
  possibly leaving the repl buffer with the wrong default-directory
make clojure-test-run-tests auto-jump to the test buffer if in the impl buffer
finished implementing remote jack-in support, using ssh tunnels by default
minor path formatting fix to get rid of duplicate /'s
Merge pull request #61 from milkypostman/master

clojurescript-mode should probably require clojure-mode?
Merge pull request #62 from tavisrudd/master

remote/tramp jack-in support, fix a few bugs in jack-in, and improve buffer handling for clojure-test-mode
fixed bug where typo in name of hook was causing errors and preventing user from editing buffer
Merge pull request #65 from codeforkjeff/master

error: "Symbol's function definition is void: slime-tramp-local-filename"
popup buffer in other splitted window when inferior lisp buffer has already been created
added group-by
added partition-by
added partition-all
updated README.md about ELPA outdated-ness
ELPA and Marmalade status updates
Fixed saving Google settings. Catching fatal error on entering wrong login or wrong password
Added more in python
Rename SerializableMixin. 
Moved mixins into their own module.
Added .size property to SerializableMixin.
Added HashableMixin, and revamped hash256 and hash160 to be more general hashlib-like objects.
Fix bug: asset was not being passed to deserialization method, resulting in an exception being thrown.
Code reorganization (moving methods around).
Add __eq__ and __repr__ special methods to Merkle.
Implement ValidatesMixin, cleaning up the validates() methods and converting them to raise exceptions on error in the process.
JAVA-249: Removed calls to InetAddress.getLocalHost and InetAddress.getAllByName, using InetAddress.getByName instead
Simplified code.  Fixed Javadoc.  Removed unused methods.
Made it thread-safe by making _address volatile
Include vendorized files
Prior to CMake removal
Hi hi, hi ho.. too many classes… some need to go!
generated rails controllers and views
modified ReadMe. config routes. update views
reset HEAD and cleaned up bad controllers creation
added style to application.css
added ratings controller
trying to get controller and view talking
added photos controller'
added layout styling. failed to add pic for about pg
modified views after session with Ryan
removed rate controller
fix java compilation error
[MOD-802] Added docs for ti.cloud friends, message, events, and files.
TC-1078 set charset variable when charset is not utf-8
fixed removal of views with border from a scrollview
timob-8472: fix edge case fastdev loop.
[TIMOB-9824] Don't display a background gradient on Android if colors are not specified
timob-8472: fix #2
Merge pull request #2619 from Akylas/TC-1079

[TC-1079] fixed removal of views with border from a scrollview
Merge pull request #2616 from kangaechu/TC-1078

TC-1078 set charset variable when charset is not utf-8
Merge pull request #2636 from krowley/TIMOB-9824

[TIMOB-9824] Don't display a background gradient on Android if colors ar...
[TIMOB-10203] iOS: Map Annotation image cannot be changed dynamically
Merge pull request #2633 from hieupham007/timob-8472

timob-8472: fix edge case fastdev loop.
Merge pull request #2600 from JeffEnglish/MOD-802-master

[MOD-802] Added docs for ti.cloud friends, message, events, and files.
Merge pull request #2648 from pec1985/TIMOB-10203

[TIMOB-10203] iOS: Map Annotation image cannot be changed dynamically
Moved to devkit 3.3.1, still work-in-progress
Adding heartbeats events
tidying up...
Merge pull request #4 from amck/master

Add heartbeat events to socketio
Support for non-core modules
delete renamed client.js
added functions for setting postgres serial numbers to right values
Marks

Added push/pop styles for marks.
Small version.php fix
common/footer
common/header
common/maintenance
error/not found
information/contact
information/information
information/sitemap
mail/affiliate
mail/customer
mail/forgoptten
mail/order
mail/voucher
error.txt
fixed the spawn protection, i accidentally made everyone invulnerable :[
Fix handleResize error and leave custom baseLayer creation up to bootstrap.js
Add the updated OpenSimDefaults.ini for the prior timer_Interval patch.
just another test :)
BulletSim: minor change to insure avatar body recreation when shape changes.
BulletSim: fix problem with avatars sinking into the ground.
Change terrain activation state to DISABLE_SIMULATION for better performance.
BulletSim: update binaries with small change that insures that manual position/rotation setting results in an update event.
Cambios en About
Merge pull request #3 from mvillaseco/Mauro-Branch

Cambios en About
Remove trailing comma, IE7 doesn't like
Added some convenience constructors to TextOptions.
Passing parent Entity to IEntityLoader (except for root node, where it is null).
Minor renamings.
Removed log spam

Removed log spam
List row was empty due to wrong method call

The list rows for the headings were empty due to the adapter calling the wrong method - headings have no name, only a resource so AppContributorData.getName() would return "".
use of hasttreesetthing
[refactor] Use `pipe` for websockets
Corrected a typo or two.
updates openid_connect gem
Metadata : add url64 icon and permission
Changed text width
Add voodoo color.
(Modified for syntax.)

Signed-off-by: nubecoder <nubecoder@gmail.com>
Add voodoo color to my defconfigs.

Signed-off-by: nubecoder <nubecoder@gmail.com>
Merge branch 'feature-Voodoo-Color' into dev

* feature-Voodoo-Color:
  Add voodoo color to my defconfigs.
  Add voodoo color. (Modified for syntax.)

Signed-off-by: nubecoder <nubecoder@gmail.com>
+ ‘p30t_4.jpg’
cleaning up dependencies (wrong eclipse classpath)
distdiff and distpatchgen now use multiprocessing by default
Arreglado constructor Entrada.
Merge branch 'master' of https://github.com/odea-examples/TimeTracker

Conflicts:
	db.properties
cambiada la hora
Add mockup link details
add scheduleParser.py
ビルドバッチを追加

.NET Framework4.0のMSBuildで実行
Issue #1850034 by mclendening - Disable SYSLOG_CHECK in csf by default to avoid false alarms.
Add the chmod lines in the remote how-to.
More complete permissions fix on install and upgrade (3).
Remove some commented code from Project model.
Just tidying the results page so errors are at least handled slightly gracefully.
support older version of stopTimesForStop response
do not hide start/end flags when restoring trip
fixed a typo in a string
Removed deprecated herpers, added specific .rb for json and targz helpers, json and targz tests
Improved rspec syntax
Merge pull request #32 from fabianofranz/master

Refactorings and new tests
Added a few comments and the patches for svg-salamander
Just another test ..
added queue unbind.
added pcntl signal dispatch.
+ ‘simulation/Single-photon/ssa/ReactionMatrix_2states_Fluorescence.txt’
+ ‘simulation/Single-photon/ssa/ReactionMatrix_2states_Fluorescence.xls’
+ ‘simulation/Single-photon/ssa/educts.txt’
+ ‘simulation/Single-photon/ssa/products.txt’
+ ‘simulation/Single-photon/ssa/rates.txt’
+ ‘simulation/Single-photon/ssa/ssa_fluorescence.py’
- ‘simulation/ssa/ReactionMatrix_2states_Fluorescence.txt’
- ‘simulation/ssa/ReactionMatrix_2states_Fluorescence.xls’
- ‘simulation/ssa/educts.txt’
- ‘simulation/ssa/products.txt’
- ‘simulation/ssa/rates.txt’
- ‘simulation/ssa/ssa_fluorescence.py’
uploader / 404s / backoffice / cleanup
Added some test text to see the integration to apiary.io
try endings
added more aliases for owl based competitions
met nullchecks
custom scrollpane in de applicatie gezet
Setuur bug fixed
De database kan nu images opslaan en ophalen
Attempt to get Heroku asset compilation working
Erase attempt to fix Heroku pre-compile issue
Upgrade sass-rails to hopefully fix Heroku asset precompile issue
vendor compiled assets
Get rid of precompiled assets
Add Heroku setting for asset precompilation
Move locale coffeescript up to application level
Fade read again button every time
Use a JSON string instead of a string to store settings on local storage
filtro de bairros sobre que há dados no zap
[maven-release-plugin] prepare release build-resources-0.2
fix for NOT loading carousel
Search package in locally installed packages instead of the managed repositories (Packagist). Fix problem with not finding the package when it is not on Packagist.
Merge pull request #1 from Sanjo/master

Search package in locally installed packages instead of the managed repositories (Packagist).
Detect Yum crashes
Stylus. Docs
preparing a set of functions and test structure for storing differences between research objective and snapshot or archive
[WFE-642] changes detection (withou storing)
adding missing line
testing problem with file: and file:// URIs
Merge remote-tracking branch 'pejot/master' into piotr/master
adding roevo history storing (not tested yet)
Prepared more test data for snapshot differences.
Merge remote-tracking branch 'pejot/master' into piotr/master

Conflicts:
	src/test/java/pl/psnc/dl/wf4ever/sms/SemanticMetadataServiceImplTest.java
Finished a failing test.
Site updated at 2012-04-26 21:14:12 UTC
Fixes to make probe work with current rOCCI server (cleanup still needed)
* Use provided parameters for path to X.509 certs
* Cleanup
* White space fixes
* Really use path to certs from commandline
* Started OpenStack support
Works for OpenStack
Cleanup + content type fix for rOCCI
Fix for content type for OS OCCI...
- up to 20121114, no changes to certs
Prep for release
Merge branch 'release/0.0.3' into develop
Update fetch_image.sh

Moved the images folder to public_html because that makes sense. The symlink thing was stupid.
Adding more validation support
review render local variable remname
Dramatically simplified last non-merge commit detection; 'regexg' pkg no longer req'd
Completed documentation for Player.java.
Completed documentation for Music.java.
Completed documentation for Location.java. Also fixed one of the constructors.
Completed documentation for Item.java.
Completed documentation for Exit.java.
Completed documentation for Enemy.java.
Completed documentation for TechDemo.java. (aka prototype game for debugging)
Updated script to use new run_script_usage_tests() interface in the development version of QIIME.
Fixed conflict
deleted /packages/wallpapers /packages/apps/fsl_imx_demo
Merge remote-tracking branch 'dxw_repo/master'
Make EclipseLogAppender conform

Tabs to spaces, switch license to Apache, move to eclipse package, add unit tests
Add support for allowed_service_ips whitelist.

allowed_service_ips can be set in config.yml to limit service
validations to a certain set of IPs or IP ranges. This prevents
just any site from being able to grab potentially sensitive
personal information.
run rake appraisal:install to update gemfiles

Signed-off-by: Tyler Pickett <t.pickett66@gmail.com>
fix requirement of hash_with_indifferent_access

Rails 2.3 doesn't to have this file in this
location and pulling in core_ext gets the file
in all current versions of ActiveSupport.

Signed-off-by: Tyler Pickett <t.pickett66@gmail.com>
Merge branch 'allowed_service_ips'

Conflicts:
	lib/casserver/server.rb
	spec/spec_helper.rb
Choose ICY/HTTP response format based on presence of icy-metadata request header for AAC and MPEG streams.
Allow management of the library HttpClient

Make the HttpClient instance used by AbstractAjaxCallback more accesible
to the end user allowing him to set his own instance, get the instance
and customize it (set a custom RetryHandler, modify the HttpParams, etc)
Added IDE dependent ignores
Added a sample test file
Initial checkin
Merge branch 'develop' into sachin_static
add txt2man as dependecy to build config-packages
replace bsd license for gpl3
add empty debian/TODO file to have list of bugs somewhere in code
Merge remote-tracking branch 'config-package/upstream' into rebranding-branch
Merge branch 'rebranding-branch'
Release new package version.
Fix path changes.
first import
Merge branch 'master' of github.com:redguardtoo/root-dotfiles
update README
Fixes issue where permit returns permitted as true when only some filters match
Changed the order of title and sub title to make it tab/search engine friendly.
Improved position/link color of the footer.
add in bindUnload
opt_handler is control by default
Added automatic counters to MetriQInterceptor - will record impressions of all functions that have been intercepted
js-beautify version bump
メッセージ追加
追加したメッセージに誤りがあったため修正した
Merge pull request #2 from AtsushiFuje/work
add message
Merge branches 'master' and 'ope'
merge ishisaka/ShizudevGithubHW
add message
Merge pull request #4 from dozen/work

Message.txtの変更内容を確認し、マージします。
add message
Merge pull request #5 from tomof/work

マージします。
add by UseK
Merge pull request #6 from Usek2g/work

add by UseK
pull from original
Added AmazonQuestion
Rotating tiles in level editor works now

Press R in the level editor to rotate textures :p
Fix compilation with space in path
The --old-fashioned-inventory option is also not understood by darcs version 2.8.0 . Moving the condition for --hashed usage down to darcs 2.8.0.
Gestiona cambios por aparte admin de enviado y no enviado de cada carro
falta solo pagar pedido y enviar correo con pdf
mejorada db fallo por no tener idCarro autoincremental (como se
cambio??)
Rebase from 'release/bondcpp' @ version '1.7.8'
Generated debian files for oneiric
Use host name set by plugin
Update for Guard 1.1 and prepare for new release
Release 0.4.0
allow array in :root_file; fix run_all task
forgot a , in a hash
CSHARP-639: Use ToInt32 instead of AsInt32 to make the driver be more tolerant of the server returning numeric values using different types.
new stuff
Expanded domain model
LOOPLED auf PORTF4
Myriad package updates
2 timmar:
-Ändrade i surface, den håller pointers till inladdade surfaces (INTE HELT FÄRDIG, måste lägga in så den kollar om ett filnamn är inladdat, samt sköta urladdningen tillsammans med sprite)
-En grundversion av sprite är skapad, den håller nu bara position och laddar sdl_surface genom klassen nämnd ovan (surface)
Revert "Initial commit"

This reverts commit 2952b24912a0a04ec095a470523e6c7e73f3d66c.
NOJIRA cleanup formatting to make it consistent

git-svn-id: https://source.sakaiproject.org/svn/entitybroker/trunk@115881 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22690 removed logged warning when user cannot be found by eid or id


git-svn-id: https://source.sakaiproject.org/svn/entitybroker/trunk@115882 66ffb92e-73f9-0310-93c1-f5514f145a0a
SDM - adding more tag logic and some new tags
julia: Using inreplace instead of patches.

This should make it break less often, because the git patches
apply only if both hashes are checked. Therefore, any small change
in any of the patches files breaks the whole patch. With inreplace we search/replace only a certain line.

Added doc about the LDFLAGS thing.
add valgrind to path.
Reclassify all devices that belong to changed entityclasses or null entity class. And also some fixes to prevent race conditions.
git-svn-id: http://the-ptsp-competition.googlecode.com/svn/trunk@9 c3b543cc-e2d2-693f-7a8c-fd19e9a15b4d
Revert "ignore framework?!"

This reverts commit 5358ee96a8c90e21ccfe545cce0e723930e82d8e.
Merge remote-tracking branch 'origin/original'
request for tuition assistance added closes #5
ATOM Threads: Basic Ram FS with open, read, write calls and tested it
Added restrictions to column indexing.
base-responsive notice
Putting dates onto the front-page news.
BF: Make MinCovDet work with n_samples >> n_features.

When the number of samples war too large, we were looking for the 10 best
matchs over less than 10 trials, which resultes in an error.
ENH: issue warning when minmax scaling integer data + test
changed n_folds > min_labels error to warning

Also made indentations for continuation lines pep8. See
http://www.python.org/dev/peps/pep-0008/#indentation

Conflicts:

	sklearn/cross_validation.py
removed tests for the old error.

Is it possible to test for warnings?
added test for warning. Added warning category

Conflicts:

	sklearn/cross_validation.py
removed a carriage return in warning message
added space between # and text
Merge pull request #1465 from AWinterman/issue-1017

MRG More Liberal StratifiedKFold Input Validation
Update for jruby tests.
Applying updates
try device-width..
working on door status screen
minor change; method calls must match those in Country
Merge branch 'master' of github.com:sebastian-claici/stats-uk
fixed issue: https://github.com/sebastianbergmann/phpunit/issues/322
and described part of: https://github.com/sebastianbergmann/phpunit/320

don't know if this fixes #320 completely as i cannot reproduce this behavior with other parameters:
- strict
- verbose
- debug
Merge remote branch 'cryptocompress/patch-1'
Tests for group filtering issue when the phpunit.xml and commandline flags are used. Closes #322
Changelog for #320 #322 and #607
Initialized to use tito.
Automatic commit of package [report_server] release [0.3-1].
Add tests for Voldemort
Fix download url path for Voldemort
Fix rmfile and mkfile (passing suffix for trashing)
indent/velocity modify base on htmldjango.vim
shilpa/vinay view details of a student
Merge branch 'master' of https://github.com/shilpasingla/CampusHunter

Conflicts:
	db/development.sqlite3
	db/schema.rb
	log/development.log
	tmp/cache/assets/CF0/DA0/sprockets%2Fd7d5b37686831d37c4dd75e645f5e016
	tmp/cache/assets/E25/4C0/sprockets%2Fde2fd9fd11c04a582cdbbe3d84a35ae6
	tmp/pids/server.pid
DB Folien Final 0.9 Beta Gamma

Signed-off-by: Matthias Beer <silkslostsoul@hotmail.com>
Linux 3.0.34

Changelog:
http://www.kernel.org/pub/linux/kernel/v3.0/ChangeLog-3.0.34
keyboard: cypress: Use standard voltage for constant/blinking bln
Revert...
Added Samsung initramfs and AOSP initramfs
Preparing to have multiple deploy files for staging/production
Init
Merge branch 'master' of github.com:skiffer/Multithreading_v2.git
separate proxy class from controller.
first import
Merge branch 'master' of github.com:skylord73/acts_as_monitor

Conflicts:
	.gitignore
	Rakefile
	acts_as_monitor.gemspec
	lib/acts_as_monitor.rb
s
Some small work today
Concerning mouse detection
For color blocks game.
Custom fields for the Resources page and the People Behind page.
Updating Arquillian JUnit Test wizard
doh regexp error =(
Example repo URL - see Github issue 516
Updated Github API to V3.

Github API V2 has been removed.  The response data format also changed.
Updated Github API to V3.

Github API V2 has been removed.  The response data format also changed.
Merge pull request #666 from nathanl/example_repo_url

Example repo URL - see Github issue 516
Updated gems and rubies to 1.9.3
Merge branch 'master' of github.com:imathis/octopress
Fix for issue #622

The filters bundled with Octopress are not applied to files ending in 
`.md`, because the match in octopress_filters.rb does not match `.md`.
Merge pull request #706 from Confusion/patch-1

Fix for issue #622
bumped rbenv version fixing #743
Merge branch 'master' of github.com:imathis/octopress
Updated Github API to V3.

Github API V2 has been removed.  The response data format also changed.
Updated Github API to V3.

Github API V2 has been removed.  The response data format also changed.
Merge pull request #675 from zlu/master

Update Github API to V3
Twitter API call and links are now protocol relative
Merge branch 'master' of github.com:imathis/octopress
Using https instead of protocol relative urls, for Pinboard and Twitter feeds
Disabled Rsync delete by default. Closes #787
Make value a private property of Results
Merge branch 'master' of github.com:solsticedhiver/arteVIDEOS
updated to depend on nexus oss 2.2

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
Fix tasks action/message

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
Update the README file with a more detailed description of the project.
added fuzzy folder to classpath
field exprs
Properly clean up manager resources on exit

This patch does two things:
1) It properly unregisters the manager CLI commands
2) It cleans up AMI users on exit.  Prior to this patch, the AMI users
   were not being disposed of properly, resulting in a memory leak.

(closes issue ASTERISK-20646)
Reported by: Corey Farrell
patches:
  manager_shutdown.patch uploaded by Corey Farrell (license 5909)
........

Merged revisions 375793 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 375794 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: http://svn.asterisk.org/svn/asterisk/branches/11@375795 f38db490-d61c-443f-a65b-d21fe96a405b
Only deref a reserved gateway session if we actually reserved one

Its perfectly acceptable to have a gateway session unreserved when we go to
first allocate one.  Unreffing the reserved gateway session - when its NULL -
will result in an assertion error.

This problem was caught by the Asterisk Test Suite (once we had enough of the
debugging flags enabled)
........

Merged revisions 375797 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: http://svn.asterisk.org/svn/asterisk/branches/11@375798 f38db490-d61c-443f-a65b-d21fe96a405b
Don't attempt to purge sessions when no sessions exist

Manager's tcp/tls objects have a periodic function that purge old manager
sessions periodically.  During shutdown, the underlying container holding
those sessions can be disposed of and set to NULL before the tcp/tls periodic
function is stopped.  If the periodic function fires, it will attempt to
iterate over a NULL container.

This patch checks for whether or not the sessions container exists before
attempting to purge sessions out of it.  If the sessions container is NULL,
we simply return.

Note that this error was also caught by the Asterisk Test Suite.
........

Merged revisions 375800 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 375801 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: http://svn.asterisk.org/svn/asterisk/branches/11@375802 f38db490-d61c-443f-a65b-d21fe96a405b
Prevent multiple CDR batches from conflicting when scheduling the CDR write

The Asterisk Test Suite caught an error condition where a scheduled CDR batch
write can be deleted twice if two channels attempt to post their CDRs at the
same time.  The batch CDR mutex is locked while the CDRs are appended to the
current batch list; however, it is unlocked prior to actually scheduling the
CDR write.  As such, two threads can attempt to remove the currently scheduled
batch write at the same time, resulting in an assertion error.

This patch extends the time that the mutex is locked to encompass actually
scheduling the write.  This prevents two threads from unscheduling the
currently scheduled write at the same time.



git-svn-id: http://svn.asterisk.org/svn/asterisk/branches/1.8@375727 f38db490-d61c-443f-a65b-d21fe96a405b
confbridge: Fix a bug which made conferences not record with AMI/CLI commands

(closes issue ASTERISK-20601)
Reported by: Vilius
Patches:
    confbridge_mixmonitor.diff uploaded by Jonathan Rose (license 6182)


git-svn-id: http://svn.asterisk.org/svn/asterisk/branches/10@375470 f38db490-d61c-443f-a65b-d21fe96a405b
"show" completion option for "queue" shouldn't appear twice

When tab-completing CLI commands starting with "queue", "show" appeared
twice in the list due to the way that Asterisk's tab completion
functions and the order in which the commands were registered. The
registration order has been altered to resolve this issue.

(closes issue AST-940)
Reported-by: Steve Pitts


git-svn-id: http://svn.asterisk.org/svn/asterisk/branches/1.8@373666 f38db490-d61c-443f-a65b-d21fe96a405b
compile swf
Add CHANGELOG, up version number to beta.2
Edit run scripts for test automation
modify Rakefile
Merging a few changes
Edit filler data
Edit query tests
Merge branch 'development' into test_automation
Integrate push sdk into core sdk
refactoring&reformatting
DOMS-164 - migrate projects to git: Update pom.xml to reflect the new scm paths.
Add basic .gitignore
update .gitignore to ignore eclipse specifics
Start work of import functionality
Fixed the upload file import functionality. Probably broken the uploadable datastreams now, but we will probably use import for all file uploads anyhow.
Fixed the datepicker input stuff in import
remove import menu item
Remove intellij-files and ignore them.
add initial page with unified import and create new functionality, page is not functional yet.
Merge branch 'master' of github.com:statsbiblioteket/doms-gui
Create a new 'new record' page and remove the old ones along with their unused beans
make import functionality redirect to search page after starting process
New search-column layout.
Fix indentation and line-endings.
Make import work (provided the content model i 'correct'
Merge branch 'master' of github.com:statsbiblioteket/doms-gui
Ignore .idea/
Implement datepickers for time-period searches.
Fix indentation.
Add maven settings file
moving gemfile to root directory

trying to get it running on Heroku
add html classes to inputs with the wrappers API

enable a user to add classes or other html attributes to inputs,
labels, and custome components using the wrappers API.  this is
accomplished by passing `false` to the tag key of the wrap_with
options - like so

   b.use :input, :wrap_with { :tag => false, :class => ['cool'] }

passing an argument with a `false` tag is only meaningful in the case
of a single wrapped component which generates a tag itself
(so, `label` and `input` is about it out of the box.)  A custom
component which wants to support this functionality should look in
`options[:#{namespace}_html]` for the html options to use.
validation

front end validations like formating due field...in newtransaction form
Put config in the right place
Readmy corrected
commit before pull
New FormKAnagram style!!!
some cleanup, added bootstra-responsive
now fits better for mobile gadgets (media-queries)
Fix unit test for ZF-6061 under Windows

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24978 44c647ce-9c0f-0410-b52a-842ac1e357ba
ZF-12174: Fixed incorrect docblock in Zend_View_Helper_Currency


git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24768 44c647ce-9c0f-0410-b52a-842ac1e357ba
minSdk 4 so small screens will be supported
initial oscillate code
minor index change
initial anim effect added
introducing dynamic generation of animations, needs some refinements
adding todo items
first cut random selection functionality
added dialog first cut
styling added
end of branch
merging indexes
update jquery-ui to v1.9.1
use the new uniqueId() function to fix WorkflowComponentFigure context menu problem
Adding the deploy/assets stuff to the Capfile for the asset pipeline.
Added links to the fullsize images on media.
gitignore some generated files
move module to the "standard" place in lib/
gitignore
Wywalenie błędów
Finished JoinMessage v1.3
test pivotal tracker api
Add some null checks so we don't break secure locks..
Merge branch 'master' of github.com:teamgummy/frameworks_base
agregando el estilo que habia hecho hace mucho
Merge branch 'master' of github.com:teleSUR/telesur.reportero

Conflicts:
	src/telesur/reportero/content/anonreport.py
	src/telesur/reportero/content/ireport.py
Less strict dependency
Fixed Auras

Damage now pierces properly, and debuffs are applied. Damage scaled down
to 10% of attack / second.
Updated Figures and Added
Signed-off-by: Thanh Nguyen <sir.dtnguyen@gmail.com>
Обновлено пояснение настройки социальных кнопок
add access to the batman-adv gateway list
Move manage.py para src/
Adiciona validação das datas.
Mostra modal e corrige a data após validação.
Inicia process de save da lista de absenteeism's.
Ignora arquivos do sqlite.
Ignora dir /share 
Corrige o nome dos fields do model.
Corrige config de i18n no settings.
Add models para Absenteismo e entradas do Absenteismo.
Cria form para validar entradas do Absenteismo.
Salva os dados.
Merge branch 'release/20120814'
added test coverage for new gsub on options ids get request
Merge branch 'release/20121003'
tests for post and get person object relation, doc updates
wrong things in session controller (until now unused)
Modified crop-to function to use self.layersById rather than self.layers
Addded a bbox if it didn't exist on a geometry to be cropped
First Messy Project
Generates css docs when only css directory given

Configurable with styleguide.html which contains header and end tags.
For some reason I cannot get the block to work in helper function,
so the example_html must be given as a parameter for now.

I try to fix that in the future, but seems so strange really.

Check readme for usage instructions
Merge pull request #1 from heimojuh/patch1-proper

Improovies.
New comment repository
added something in develop
henkscommit on henksbranch
UI updates, bug fixes, maps using leaflet

also includes library include files
finish the basic readme
First pass at 5x5 board
Merge branch 'master' of github.com:trustrachel/hip-hip-array
lane fixes (width and bgcolor settings)
permissao p pacientes, criada agendas e consultas [unstable]
Updated .gitignore

To hopefully get rid of debugging directories
fixed Makefile.PL for latest Module::Install to run travis-ci correctly
Ugly hack to get favorite nav highlight.
Added method for profile setting page which help to set the event notifier priority
Add thi template to see the posted comment wth user and posted timestamp
Harmonised the Perfect Team process.
Merge remote-tracking branch 'origin/peter_dmp_tf' into mrinal_tool_frame
Merge branch 'master' into peter_dmp_tf
completed profiles
Modified path-declarations and checking
Moved to another location
[couchdb] Day 1
user settings storage, options page
Corrigindo template myvindulalistuser
Update upgrade-tengine.sh

Tengine modified version for 1.4.2
sensors_guide add laser
Editar contar 
compress validate
Add session data to param pool.
Section orientation
signal synchronization for make_zombie
Added READMEs for each folder
refactored more the classify function
removing unused lines from patch
moved old library into new namespace for open source project
Adding a tester for the connectionViewer
Pitch calculation update

Pitch calculation update
mv
Test data with context
Make failure handler optional
Add the Ajax and HTTP server version.
Pretty printing matrix-server help info
Add README
Slight modification of help info.
change Server newtype to ReaderT
ErrorT String -> ErrorT (CoroutineError ())
test substate first time
using Lens for accessing state
SubOp, make door and messageBoard as individual object on top of WorldState State monad
use normal vim indentation bindings
Fixes issue with database backup
Add support for 1.7.5 beta
Added View menu item to display Web Inspector
GamePrediction toegevoegd + loading
Cleared the English po files since they got tainted a few commits ago...
Second draft at a still very sloppy XPath visualizer/explainer page.
adding created_at field for post and comment
initial xml header
remove empty rescue when loading settings file so that formatting issues in the settings file cause the application to exit
do not require_provider when accessing provider select
Merge pull request #27 from tzumainn/master

Minor fixes to ease debugging of startup issues, and to allow providers to be selected
Reverting sorting characters to proper unicode
fix bug i18n错误
fixing bug with csrf config that was causing false positives
Added Spanish translations.
Merge pull request #7 from phansys/patch-1-translations

Added Spanish translations.
Change MenuFlags to match the new enum
Fix native libraries
Add Support4 sample for compatibility API binding (lv.4) support.
Fix all samples to work with the enum changes
Fix GLTriangle, the context is already create when OnLoad is called
Opentk 1.0 updates
Add ExportAttribute sample.
Add Parcelable.CREATOR usage in ExportAttributeTest.
Imported SurfaceView Overlay sample from ApiDemos.
Add GestureBuilder sample.
Add Metadata.xml and README.md to ExportAttributeTest.
add missing copyrights.
follow up namespace changes in Export stuff.
Fixups for 4.1 preview.
Fix OpenTK samples
Add handy build script that builds all sample projects
Fix ExportAttributeTest activity name.
Fix Export stuff in GestureBuilder sample.
Merge branch 'monodroid-4.1-preview' of github.com:xamarin/monodroid-samples into monodroid-4.1-preview
GLCubeActivity.OnResume() should call base.OnResume() otherwise ActivityThread borks.
function to refresh browser info to reflect changes by other users
Update php/checkMatrixURI.php
- Add tests for io.File::equals()
Revert "- Add tests for io.File::equals()"

This reverts commit 849f6dc392e5a7437fe3f534b231101c01cb971b.
- Add tests for io.File::equals()
- Add tests for io.File::hashCode()
- Implement equals() and hashCode() methods
- Add tests for io.Folder::equals()
- Implement equals()
- QA: Apidoc
Merge pull request #181 from thekid/file-equals

File & folder equality
add background music playing + play-stop behaviour
comment blackmast
fix bug and lan9220 support
Added sidekiq monitoring
Remove config file and add to ignore
Mag help
ie:DV
Merge branch 'mauricio' into testmerge
Initial commit
zet first edited release
linux end of line
ron added
= =
Signed-off-by: zhengjiabin <zhengjiabin.tj@gmail.com>
又改了teaHome.jsp，不用go参数了，（还有，那个日历显示出现问题了啊，数据还填不起form表单）
Signed-off-by: zhengjiabin <zhengjiabin.tj@gmail.com>
审核用户翻页修复
Signed-off-by: Li Mi <limisky@gmail.com>
restrucutre
buill king textures fixed
Add Design Posts
Reinstated modal functionality
Fix for act-1447, thanks Saeid
Initial import of 1.2.5 version
Added Custom Voltage version 3.
Comments fix, added robots.txt to deny all
generated NsConstant and NsFunction and added DefineConstantBuffer with test
fix CodeConverter work with constants
update, CodeConverter can work with namespace aliases
3.0 final.
Ignore the stackforge jenkins email address

Update generate_authors to ignore the email address
for the stackforge jenkins as well as the main openstack
jenkins, to ignore commits in the history of projects
that were on stackforge before moving over to the
main server (such as ceilometer).

Change-Id: I86d93ba0f358d5d33278847ba8de039642dd54b7
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
.gitignore updates for generated files

Ignore files created by packaging, builds, etc.

Change-Id: I9c1eed8c9791548b46e1532b345d80f3d84d4890
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
Merge "Ignore the stackforge jenkins email address"
Implemented priorities as another argument for ad codes.

Priorities give us more control over which ad codes appear on which pages. All ad codes have a priority of 10 by default. A lower number is greater priority, as this follows the way priorities work in core.

See #6
Just saying hello to the Portland WordPress Users Group
Fixed issue where priority code didn't pass type check and default priority of 10 was set.
Removed check for logical operator, so that when ad code has no conditionals it's added to "ad codes to display" array
skeleton ACM Provider class and skeleton DFP and OpenX child classes
php5 syntax, we're using php5 functions anyway
CRUD actions abstracted
coding standards, code cleanup, PHPDoc
Created new base class ACM_WP_List_Table, some base methods are already there
(table is being displayed, but no CRUD manipulation is possible yet)
Mock generic WP UI
temporary workaround for flushing cache
call add_cache_key_to_index method if we're adding new cache element
If there aren't any ad codes registered yet, kick out so we don't produce a lot of errors
No error_log() in the champagne room
If the logical operator has changed to AND, we need to break the loop if any conditional evaluates false

Fixes #15
New filter allows implementors to change the behavior of ACM as it comes to determining whether to display an ad code or not.

By default, ACM will ignore any ad codes without conditionals. This prevents them from showing up on the frontend as soon as an admin saves the code.

Modify this value to true to have your ad codes appear on the frontend without conditionals

Fixes #16
Remove something I added a long time ago... whoops
Ability to add new ad code and conditionals in one action with new UI
remove all jqGrid related resoureces
remove jqGrid related js code, add ACM css
more UI changes
New create() method for creating a guest author. Includes basic validation to ensure we don't have guest authors with duplicate user_login values

See #26
Fixed typo in cut command and added whitespace strip to deal with parsing issues.  Standardized the log format to allow grep for SUCCESS, WARNING, ERROR.
Added a template for the PathVisio server jar
Add maintainers for LG Optimus V & S ;)
adding cms modules and updating jsp's
updated spotlight module image
attempt to debug file creation error
More messing around with maps

Doors and doors and doors
refactored coffe to use normalizeFiles
WindowDX no longer steals the mouse pointer
Merge branch 'master' of github.com:CaterHatterPillar/PACMANIA
Fixed some of the memory leaks
Merge branch 'master' of github.com:CaterHatterPillar/PACMANIA
Fixed zoom problem
Merge branch 'master' of github.com:CaterHatterPillar/PACMANIA
Merge pull request #160 from ChristianGiupponi/1.1/develop

Fixed italian lang file
Moving some cart manipulation functions to fs_cart library
Moved brands out of the core FireSale module
20121223
Update master
Merge pull request #1 from jahller/master

Test Request
re-added hilight, added include
Added the way users are created
Prettied up the site a bit more. Added roleplay notifications.
Removed public/assets
Added Default MVC4 Application to test app harbor
more moving stuff to where it belongs
implemented shadow text and transparency in Rect Button class
and yet more minimal improvements
stride instead of window
read changed
work
Added String.levenstein for IE7 or others
added tests for String.levenstein
added documentation for supported distance methods
documentation for string distance method
preferred method now levenstein due to IE7 issues
updated tests to implicitly support levenstein and sift3 w/o reliance on default
CHANGED: Global USER_AGENT and WEBSITE
Fix Heisenplayers
CraftBukkit-- changes.

https://github.com/Afforess/CraftBukkitPlusPlus/commit/ce93c287a15b87388a284ba6cfa34374562c45fe
https://github.com/Afforess/CraftBukkitPlusPlus/commit/7f40517f97d8da249a186abe2e3a74bc27547acf
https://github.com/Afforess/CraftBukkitPlusPlus/tree/801275c0b045ed3f4dca3c95aea3c8feb2a265dd

BlockRedstoneTorch
EntityPlayer
EntityTracker
EntityTrackerEntry
Also check worlds.size()==0 in MinecraftServer
Quick fix for pex.
Added margin to top of Footer instead of the bottom of page containers.
aktuelles projekt
Fix re: https://github.com/EnigmaCurry/blogofile/pull/114.
Added is_block_solid(locationArray)
Fixed an issue where if all arguments in an if/ifelse were optimized out, it would fail.
Merge pull request #60 from EntityReborn/master

Yummy goodness.
Merge pull request #62 from EntityReborn/master

Fix for issue 2188
Merge branch 'master' of github.com:sk89q/commandhelper.git
Fixed remaining issues with if/ifelse and brace syntax.
Added the ability to supress logging of a command by prefixing it with !
fix spawn_mob throwing exceptions when there is no subClass, and fix PigZombies getting the Zombie handling.
add onlinemode check to get_server_info, add effect data to make_effect, and change item_drop function to not be confused with the event
block_break: add location and xp data, add xp mutable, make drops field based on the tool used to break it

Fixes Bug 1984
half fixes Feature 1886
Fixed issue with adding elements to the child array if it was empty, during ifelse optimization. Also further optimized and/or.
Added @key @value syntax for foreach, which avoids having to do array_keys now. Additionally, cslices now extend arrays, so they will work in ALL cases that an array would work, but they are more efficient, because they use an algorithm to generate the value given the index, vs caching all the numbers.
Fixed a bug with switch using cslices.
Added unit test to demonstrate failure of whitespace lexing.
Added sudo(), and deprecated runas(~op)
Added initial docs for MSP
made make_effect not crash clients, added auto-lookup of valid vanilla block/item ids
Merge pull request #61 from jb-aero/pullable

Fist full of fixes
Removed is_block_solid, and replaced it with get_block_info, which returns a bunch more data about a block (this can be further extended later)
Fix ArrayIndexOutOfBounds exception.
Fixed modifying 'text' with the sign_changed event.
Revert "Added 2 new tiles in ship-indoor.png to seriously improve the shadow in 000-0-0."
This reverts commit 582dd37ab7baf13efccfa44fbdb0c704db8edf22.
Reason:
Useless change, it has already been discussed.
+ Tiles added in the wrong tileset,
+ Change hasn't been discussed before the push in the repo,
+ 3% opacity of a pixel line of 10pixel*1pixel is not an improvement.
+ These tiles are 000-0-0 specific change, not applicable in any other map.
Bug in Gulukan dialogue fixed.
Add blank line before item selection on alige script.
Replace getitemname by getitemlink on Croconut.txt .
Renamed the Plushroom Box and the Sea Drops in the database and some scripts.
copy/paste + zoom/pan
Merge branch 'dev-0.7' of github.com:ExoticMatter/Naiad-Clients into dev-0.7

Conflicts:
	studio/src/NsGraphView.cc
asdf
Merge branch 'dev-0.7' of marcus.github.com:ExoticMatter/Naiad-Clients into dev-0.7
setting the plug cache mode to SHALLOW for all body-input plugs
add markup
Made private vars/methods protected to allow inheritance
Converted private to protected
Added addParam() method to include undocumented or ad-hoc parameters
Added facets
prevent the other player from winning
README and LICENSE
README and LICENSE
Lowered minimum perl version required.
.gitignore files out of dist, Added MinimumPerl
Ready for v0.004 release, updated Changes
页面脚本改动

主页面+登出脚本
Added header bar, done button, and text input field; done button reacts to selection of input field for editing.
Removing some forward looking statements
Update README.md

MD rocks!
2.6.8
- Fix - in missing.txt show albums missing all artwork
- Fix - in missing.txt don't show albums that have all artwork
- Fix - one to many periods
+ add validation
copy style from psd to style file
No markup, or more markup. What should it be?