[scala-2.10] 46/166: Merge commit 'upstream/2.7.7.dfsg'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Nov 15 12:43:26 UTC 2016


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository scala-2.10.

commit df1e394755cd3afb2670ffd8bd9abc3405727336
Merge: 01bf3bc e5c9da0
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sat Oct 31 21:15:28 2009 +0100

    Merge commit 'upstream/2.7.7.dfsg'

 META-INF/MANIFEST.MF                               |    2 +-
 build.number                                       |    2 +-
 src/actors/scala/actors/Actor.scala                |    2 +-
 src/actors/scala/actors/ActorGC.scala              |   38 +-
 src/actors/scala/actors/ActorProxy.scala           |    2 +-
 src/actors/scala/actors/Channel.scala              |    2 +-
 src/actors/scala/actors/Debug.scala                |    3 +-
 src/actors/scala/actors/FJTaskScheduler2.scala     |  108 +-
 src/actors/scala/actors/Future.scala               |    2 +-
 src/actors/scala/actors/InputChannel.scala         |    2 +-
 src/actors/scala/actors/MessageQueue.scala         |    4 +-
 src/actors/scala/actors/OutputChannel.scala        |    2 +-
 src/actors/scala/actors/Reaction.scala             |    3 +-
 src/actors/scala/actors/Scheduler.scala            |   37 +-
 src/actors/scala/actors/TickedScheduler.scala      |    2 +-
 .../scala/actors/remote/FreshNameCreator.scala     |    4 +-
 .../scala/actors/remote/JavaSerializer.scala       |    6 +-
 src/actors/scala/actors/remote/NetKernel.scala     |   18 +-
 src/actors/scala/actors/remote/Proxy.scala         |    8 +-
 src/actors/scala/actors/remote/RemoteActor.scala   |    6 +-
 src/actors/scala/actors/remote/Serializer.scala    |    4 +-
 src/actors/scala/actors/remote/Service.scala       |    4 +-
 src/actors/scala/actors/remote/TcpService.scala    |    8 +-
 .../actors/scheduler/TerminationMonitor.scala      |   70 +
 .../actors/threadpool/AbstractCollection.java      |   32 +
 .../actors/threadpool/AbstractExecutorService.java |  292 +++
 .../scala/actors/threadpool/AbstractQueue.java     |  170 ++
 src/actors/scala/actors/threadpool/Arrays.java     |  811 ++++++++
 .../scala/actors/threadpool/AtomicInteger.java     |  210 +++
 .../scala/actors/threadpool/BlockingQueue.java     |  342 ++++
 src/actors/scala/actors/threadpool/Callable.java   |   35 +
 .../actors/threadpool/CancellationException.java   |   34 +
 .../scala/actors/threadpool/CompletionService.java |   97 +
 .../actors/threadpool/ExecutionException.java      |   65 +
 src/actors/scala/actors/threadpool/Executor.java   |  112 ++
 .../threadpool/ExecutorCompletionService.java      |  178 ++
 .../scala/actors/threadpool/ExecutorService.java   |  331 ++++
 src/actors/scala/actors/threadpool/Executors.java  |  667 +++++++
 src/actors/scala/actors/threadpool/Future.java     |  142 ++
 src/actors/scala/actors/threadpool/FutureTask.java |  310 +++
 .../actors/threadpool/LinkedBlockingQueue.java     |  751 ++++++++
 src/actors/scala/actors/threadpool/Perf.java       |   28 +
 src/actors/scala/actors/threadpool/Queue.java      |  191 ++
 .../threadpool/RejectedExecutionException.java     |   62 +
 .../threadpool/RejectedExecutionHandler.java       |   34 +
 .../scala/actors/threadpool/RunnableFuture.java    |   24 +
 .../scala/actors/threadpool/SynchronousQueue.java  |  833 +++++++++
 .../scala/actors/threadpool/ThreadFactory.java     |   41 +
 .../actors/threadpool/ThreadPoolExecutor.java      | 1968 ++++++++++++++++++++
 src/actors/scala/actors/threadpool/TimeUnit.java   |  407 ++++
 .../scala/actors/threadpool/TimeoutException.java  |   38 +
 .../actors/threadpool/helpers/FIFOWaitQueue.java   |   85 +
 .../scala/actors/threadpool/helpers/NanoTimer.java |   29 +
 .../actors/threadpool/helpers/ThreadHelpers.java   |   66 +
 .../scala/actors/threadpool/helpers/Utils.java     |  343 ++++
 .../scala/actors/threadpool/helpers/WaitQueue.java |  146 ++
 .../scala/actors/threadpool/locks/CondVar.java     |  190 ++
 .../scala/actors/threadpool/locks/Condition.java   |  434 +++++
 .../scala/actors/threadpool/locks/FIFOCondVar.java |  146 ++
 src/actors/scala/actors/threadpool/locks/Lock.java |  328 ++++
 .../actors/threadpool/locks/ReadWriteLock.java     |  104 ++
 .../actors/threadpool/locks/ReentrantLock.java     |  959 ++++++++++
 .../threadpool/locks/ReentrantReadWriteLock.java   | 1339 +++++++++++++
 .../scala/tools/nsc/backend/icode/GenICode.scala   |   99 +-
 src/compiler/scala/tools/nsc/doc/script.js         |    4 +-
 .../scala/tools/nsc/symtab/classfile/Pickler.scala |   49 +-
 src/compiler/scala/tools/nsc/transform/Mixin.scala |   22 +-
 .../scala/actors/FJTaskScheduler2.scala            |    7 +-
 src/library/scala/concurrent/SyncVar.scala         |    2 +-
 .../scala/tools/partest/nest/CompileManager.scala  |    2 +-
 .../scala/tools/partest/nest/ConsoleRunner.scala   |    2 +-
 src/partest/scala/tools/partest/nest/Worker.scala  |    2 +-
 test/files/jvm/actor-bangbang.check                |    5 +
 test/files/jvm/actor-bangbang.scala                |   47 +
 test/files/jvm/actor-bangbang2.check               |    5 +
 test/files/jvm/actor-bangbang2.scala               |   45 +
 test/files/jvm/actor-looping.check                 |    5 +
 test/files/jvm/actor-looping.scala                 |   27 +
 test/files/jvm/actor-normal-exit.check             |    2 +
 test/files/jvm/actor-normal-exit.scala             |   26 +
 test/files/jvm/actor-receivewithin.check           |   16 +
 test/files/jvm/actor-receivewithin.scala           |   71 +
 test/files/jvm/actor-reply.check                   |    1 +
 test/files/jvm/actor-reply.scala                   |   31 +
 test/files/jvm/actor-syncsend.check                |    5 +
 test/files/jvm/actor-syncsend.scala                |   44 +
 test/files/jvm/actor-syncsend2.check               |    5 +
 test/files/jvm/actor-syncsend2.scala               |   44 +
 test/files/jvm/actor-termination.check             |    2 +
 test/files/jvm/actor-termination.scala             |   13 +
 test/files/jvm/natives-jvm.log                     |   18 -
 test/files/run/finally.check                       |    3 +
 test/files/run/finally.scala                       |   22 +
 test/files/run/t1535.check                         |    2 +
 test/files/run/t1535.scala                         |   15 +
 test/files/script/utf8-script.log                  |    2 -
 96 files changed, 13118 insertions(+), 240 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala-2.10.git



More information about the pkg-java-commits mailing list